Merge pull request #2020 from nicoschmitt/refactorwebsocket

Refactor WebSocket Handler
NecronomiconCoding · Aug 2, 2016 · 412e51a · 412e51a
2 parents f89ec85 + 712cfdf
commit 412e51a
Show file tree

Hide file tree

Showing 24 changed files with 56 additions and 101 deletions.
diff --git a/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj b/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj
@@ -110,31 +110,29 @@
     <Compile Include="SimpleSession.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="WebSocketHandler\BasicGetCommands\Events\WebResponce.cs" />
-    <Compile Include="WebSocketHandler\BasicGetCommands\Events\EggListResponce.cs" />
-    <Compile Include="WebSocketHandler\BasicGetCommands\Events\ItemListResponce.cs" />
-    <Compile Include="WebSocketHandler\BasicGetCommands\Events\TrainerProfileResponce.cs" />
-    <Compile Include="WebSocketHandler\BasicGetCommands\GetEggListHandler.cs" />
-    <Compile Include="WebSocketHandler\BasicGetCommands\GetItemsListHandler.cs" />
-    <Compile Include="WebSocketHandler\BasicGetCommands\GetPokemonSettingsHandler.cs" />
-    <Compile Include="WebSocketHandler\BasicGetCommands\GetTrainerProfileHandler.cs" />
-    <Compile Include="WebSocketHandler\BasicGetCommands\Helpers\TrainerProfileWeb.cs" />
-    <Compile Include="WebSocketHandler\BasicGetCommands\Tasks\GetPokemonSettingsTask.cs" />
-    <Compile Include="WebSocketHandler\BasicGetCommands\Tasks\GetTrainerProfileTask.cs" />
-    <Compile Include="WebSocketHandler\BasicGetCommands\Tasks\EvolvePokemonTask.cs" />
-    <Compile Include="WebSocketHandler\BasicGetCommands\Tasks\TransferPokemonTask.cs" />
-    <Compile Include="WebSocketHandler\BasicGetCommands\EvolvePokemonHandler.cs" />
-    <Compile Include="WebSocketHandler\BasicGetCommands\TransferPokemonHandler.cs" />
-    <Compile Include="WebSocketHandler\BasicGetCommands\Helpers\EggListWeb.cs" />
-    <Compile Include="WebSocketHandler\BasicGetCommands\Tasks\GetEggListTask.cs" />
-    <Compile Include="WebSocketHandler\BasicGetCommands\Tasks\GetItemListTask.cs" />
+    <Compile Include="WebSocketHandler\GetCommands\Events\WebResponce.cs" />
+    <Compile Include="WebSocketHandler\GetCommands\Events\EggListResponce.cs" />
+    <Compile Include="WebSocketHandler\GetCommands\Events\ItemListResponce.cs" />
+    <Compile Include="WebSocketHandler\GetCommands\Events\TrainerProfileResponce.cs" />
+    <Compile Include="WebSocketHandler\GetCommands\GetEggListHandler.cs" />
+    <Compile Include="WebSocketHandler\GetCommands\GetItemsListHandler.cs" />
+    <Compile Include="WebSocketHandler\GetCommands\GetPokemonSettingsHandler.cs" />
+    <Compile Include="WebSocketHandler\GetCommands\GetTrainerProfileHandler.cs" />
+    <Compile Include="WebSocketHandler\GetCommands\Helpers\TrainerProfileWeb.cs" />
+    <Compile Include="WebSocketHandler\GetCommands\Tasks\GetPokemonSettingsTask.cs" />
+    <Compile Include="WebSocketHandler\GetCommands\Tasks\GetTrainerProfileTask.cs" />
+    <Compile Include="WebSocketHandler\ActionCommands\EvolvePokemonHandler.cs" />
+    <Compile Include="WebSocketHandler\ActionCommands\TransferPokemonHandler.cs" />
+    <Compile Include="WebSocketHandler\GetCommands\Helpers\EggListWeb.cs" />
+    <Compile Include="WebSocketHandler\GetCommands\Tasks\GetEggListTask.cs" />
+    <Compile Include="WebSocketHandler\GetCommands\Tasks\GetItemListTask.cs" />
     <Compile Include="WebSocketHandler\EncodingHelper.cs" />
     <Compile Include="WebSocketHandler\IWebSocketResponce.cs" />
     <Compile Include="WebSocketHandler\IWebSocketRequestHandler.cs" />
-    <Compile Include="WebSocketHandler\BasicGetCommands\Events\PokemonListResponce.cs" />
-    <Compile Include="WebSocketHandler\BasicGetCommands\Helpers\PokemonListWeb.cs" />
-    <Compile Include="WebSocketHandler\BasicGetCommands\GetPokemonListHandler.cs" />
-    <Compile Include="WebSocketHandler\BasicGetCommands\Tasks\GetPokemonListTask.cs" />
+    <Compile Include="WebSocketHandler\GetCommands\Events\PokemonListResponce.cs" />
+    <Compile Include="WebSocketHandler\GetCommands\Helpers\PokemonListWeb.cs" />
+    <Compile Include="WebSocketHandler\GetCommands\GetPokemonListHandler.cs" />
+    <Compile Include="WebSocketHandler\GetCommands\Tasks\GetPokemonListTask.cs" />
     <Compile Include="WebSocketHandler\WebSocketEventManager.cs" />
     <Compile Include="WebSocketInterface.cs" />
   </ItemGroup>

diff --git a/.../BasicGetCommands/EvolvePokemonHandler.cs → ...er/ActionCommands/EvolvePokemonHandler.cs b/.../BasicGetCommands/EvolvePokemonHandler.cs → ...er/ActionCommands/EvolvePokemonHandler.cs
@@ -4,10 +4,10 @@
 using System.Text;
 using System.Threading.Tasks;
 using SuperSocket.WebSocket;
-using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks;
+using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks;
 using PoGo.NecroBot.Logic.State;
 
-namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands
+namespace PoGo.NecroBot.CLI.WebSocketHandler.ActionCommands
 {
     public class EvolvePokemonHandler : IWebSocketRequestHandler
     {
@@ -20,7 +20,7 @@ public EvolvePokemonHandler()
 
         public async Task Handle(ISession session, WebSocketSession webSocketSession, dynamic message)
         {
-            await EvolvePokemonTask.Execute(session, webSocketSession, (ulong)message.PokemonId, (string)message.RequestID);
+            await Logic.Tasks.EvolveSpecificPokemonTask.Execute(session, (ulong)message.PokemonId);
         }
     }
 }
diff --git a/...asicGetCommands/TransferPokemonHandler.cs → .../ActionCommands/TransferPokemonHandler.cs b/...asicGetCommands/TransferPokemonHandler.cs → .../ActionCommands/TransferPokemonHandler.cs
@@ -4,10 +4,10 @@
 using System.Text;
 using System.Threading.Tasks;
 using SuperSocket.WebSocket;
-using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks;
+using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks;
 using PoGo.NecroBot.Logic.State;
 
-namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands
+namespace PoGo.NecroBot.CLI.WebSocketHandler.ActionCommands
 {
     public class TransferPokemonHandler : IWebSocketRequestHandler
     {
@@ -20,7 +20,7 @@ public TransferPokemonHandler()
 
         public async Task Handle(ISession session, WebSocketSession webSocketSession, dynamic message)
         {
-            await TransferPokemonTask.Execute(session, webSocketSession, (ulong)message.PokemonId, (string)message.RequestID);
+            await Logic.Tasks.TransferPokemonTask.Execute(session, (ulong)message.PokemonId);
         }
     }
 }
diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/EvolvePokemonTask.cs b/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/EvolvePokemonTask.cs
diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/TransferPokemonTask.cs b/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/TransferPokemonTask.cs
diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/EncodingHelper.cs b/PoGo.NecroBot.CLI/WebSocketHandler/EncodingHelper.cs
@@ -10,7 +10,6 @@ namespace PoGo.NecroBot.CLI.WebSocketHandler
 {
     class EncodingHelper
     {
-
         public static string Serialize(dynamic evt)
         {
             var jsonSerializerSettings = new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.All };

diff --git a/...asicGetCommands/Events/EggListResponce.cs → ...ler/GetCommands/Events/EggListResponce.cs b/...asicGetCommands/Events/EggListResponce.cs → ...ler/GetCommands/Events/EggListResponce.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Events
+namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Events
 {
     public class EggListResponce : IWebSocketResponce
     {

diff --git a/...sicGetCommands/Events/ItemListResponce.cs → ...er/GetCommands/Events/ItemListResponce.cs b/...sicGetCommands/Events/ItemListResponce.cs → ...er/GetCommands/Events/ItemListResponce.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Events
+namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Events
 {
     class ItemListResponce : IWebSocketResponce
     {

diff --git a/...GetCommands/Events/PokemonListResponce.cs → ...GetCommands/Events/PokemonListResponce.cs b/...GetCommands/Events/PokemonListResponce.cs → ...GetCommands/Events/PokemonListResponce.cs
@@ -5,7 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Events
+namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Events
 {
     public class PokemonListResponce : IWebSocketResponce, IEvent
     {

diff --git a/...Commands/Events/TrainerProfileResponce.cs → ...Commands/Events/TrainerProfileResponce.cs b/...Commands/Events/TrainerProfileResponce.cs → ...Commands/Events/TrainerProfileResponce.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Events
+namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Events
 {
     class TrainerProfileResponce : IWebSocketResponce
     {

diff --git a/...er/BasicGetCommands/Events/WebResponce.cs → ...Handler/GetCommands/Events/WebResponce.cs b/...er/BasicGetCommands/Events/WebResponce.cs → ...Handler/GetCommands/Events/WebResponce.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Events
+namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Events
 {
     public class WebResponce : IWebSocketResponce
     {

diff --git a/...ler/BasicGetCommands/GetEggListHandler.cs → ...tHandler/GetCommands/GetEggListHandler.cs b/...ler/BasicGetCommands/GetEggListHandler.cs → ...tHandler/GetCommands/GetEggListHandler.cs
@@ -1,4 +1,4 @@
-using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks;
+using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks;
 using PoGo.NecroBot.Logic.State;
 using SuperSocket.WebSocket;
 using System;
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands
+namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands
 {
     class GetEggListHandler : IWebSocketRequestHandler
     {

diff --git a/...r/BasicGetCommands/GetItemsListHandler.cs → ...andler/GetCommands/GetItemsListHandler.cs b/...r/BasicGetCommands/GetItemsListHandler.cs → ...andler/GetCommands/GetItemsListHandler.cs
@@ -1,4 +1,4 @@
-using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks;
+using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks;
 using PoGo.NecroBot.Logic.State;
 using SuperSocket.WebSocket;
 using System;
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands
+namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands
 {
     class GetItemsListHandler : IWebSocketRequestHandler
     {

diff --git a/...BasicGetCommands/GetPokemonListHandler.cs → ...dler/GetCommands/GetPokemonListHandler.cs b/...BasicGetCommands/GetPokemonListHandler.cs → ...dler/GetCommands/GetPokemonListHandler.cs
@@ -4,10 +4,10 @@
 using System.Text;
 using System.Threading.Tasks;
 using SuperSocket.WebSocket;
-using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks;
+using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks;
 using PoGo.NecroBot.Logic.State;
 
-namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands
+namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands
 {
     public class GetPokemonListHandler : IWebSocketRequestHandler
     {

diff --git a/...cGetCommands/GetPokemonSettingsHandler.cs → .../GetCommands/GetPokemonSettingsHandler.cs b/...cGetCommands/GetPokemonSettingsHandler.cs → .../GetCommands/GetPokemonSettingsHandler.cs
@@ -4,10 +4,10 @@
 using System.Text;
 using System.Threading.Tasks;
 using SuperSocket.WebSocket;
-using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks;
+using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks;
 using PoGo.NecroBot.Logic.State;
 
-namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands
+namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands
 {
     public class GetPokemonSettingsHandler : IWebSocketRequestHandler
     {

diff --git a/...icGetCommands/GetTrainerProfileHandler.cs → ...r/GetCommands/GetTrainerProfileHandler.cs b/...icGetCommands/GetTrainerProfileHandler.cs → ...r/GetCommands/GetTrainerProfileHandler.cs
@@ -1,4 +1,4 @@
-using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks;
+using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks;
 using PoGo.NecroBot.Logic.State;
 using SuperSocket.WebSocket;
 using System;
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands
+namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands
 {
     class GetTrainerProfileHandler : IWebSocketRequestHandler
     {

diff --git a/...er/BasicGetCommands/Helpers/EggListWeb.cs → ...Handler/GetCommands/Helpers/EggListWeb.cs b/...er/BasicGetCommands/Helpers/EggListWeb.cs → ...Handler/GetCommands/Helpers/EggListWeb.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Helpers
+namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Helpers
 {
     class EggListWeb
     {

diff --git a/...asicGetCommands/Helpers/PokemonListWeb.cs → ...ler/GetCommands/Helpers/PokemonListWeb.cs b/...asicGetCommands/Helpers/PokemonListWeb.cs → ...ler/GetCommands/Helpers/PokemonListWeb.cs
@@ -5,7 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands
+namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands
 {
     public class PokemonListWeb
     {

diff --git a/...cGetCommands/Helpers/TrainerProfileWeb.cs → .../GetCommands/Helpers/TrainerProfileWeb.cs b/...cGetCommands/Helpers/TrainerProfileWeb.cs → .../GetCommands/Helpers/TrainerProfileWeb.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Helpers
+namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Helpers
 {
     class TrainerProfileWeb
     {

diff --git a/.../BasicGetCommands/Tasks/GetEggListTask.cs → ...ndler/GetCommands/Tasks/GetEggListTask.cs b/.../BasicGetCommands/Tasks/GetEggListTask.cs → ...ndler/GetCommands/Tasks/GetEggListTask.cs
@@ -1,5 +1,5 @@
-using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Events;
-using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Helpers;
+using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Events;
+using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Helpers;
 using PoGo.NecroBot.Logic.State;
 using POGOProtos.Inventory.Item;
 using SuperSocket.WebSocket;
@@ -9,7 +9,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks
+namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks
 {
     class GetEggListTask
     {

diff --git a/...BasicGetCommands/Tasks/GetItemListTask.cs → ...dler/GetCommands/Tasks/GetItemListTask.cs b/...BasicGetCommands/Tasks/GetItemListTask.cs → ...dler/GetCommands/Tasks/GetItemListTask.cs
@@ -1,4 +1,4 @@
-using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Events;
+using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Events;
 using PoGo.NecroBot.Logic.State;
 using SuperSocket.WebSocket;
 using System;
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks
+namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks
 {
     class GetItemListTask
     {

diff --git a/...icGetCommands/Tasks/GetPokemonListTask.cs → ...r/GetCommands/Tasks/GetPokemonListTask.cs b/...icGetCommands/Tasks/GetPokemonListTask.cs → ...r/GetCommands/Tasks/GetPokemonListTask.cs
@@ -1,4 +1,4 @@
-using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Events;
+using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Events;
 using PoGo.NecroBot.Logic.State;
 using SuperSocket.WebSocket;
 using System;
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks
+namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks
 {
     class GetPokemonListTask
     {

diff --git a/...tCommands/Tasks/GetPokemonSettingsTask.cs → ...tCommands/Tasks/GetPokemonSettingsTask.cs b/...tCommands/Tasks/GetPokemonSettingsTask.cs → ...tCommands/Tasks/GetPokemonSettingsTask.cs
@@ -1,4 +1,4 @@
-using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Events;
+using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Events;
 using PoGo.NecroBot.Logic.State;
 using SuperSocket.WebSocket;
 using System;
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks
+namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks
 {
     class GetPokemonSettingsTask
     {

diff --git a/...etCommands/Tasks/GetTrainerProfileTask.cs → ...etCommands/Tasks/GetTrainerProfileTask.cs b/...etCommands/Tasks/GetTrainerProfileTask.cs → ...etCommands/Tasks/GetTrainerProfileTask.cs
@@ -1,5 +1,5 @@
-using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Events;
-using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Helpers;
+using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Events;
+using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Helpers;
 using PoGo.NecroBot.Logic.State;
 using SuperSocket.WebSocket;
 using System;
@@ -8,7 +8,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks
+namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks
 {
     class GetTrainerProfileTask
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,6 @@ namespace PoGo.NecroBot.CLI.WebSocketHandler @@
     {
         class EncodingHelper
         {
             public static string Serialize(dynamic evt)
             {
                 var jsonSerializerSettings = new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.All };
@@ Expand Down @@