From d5d868ef2fc037b8ec5e7993743d14b0c843a8ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Boh=C3=A1=C4=8Dek?=
 <fandabohacek@gmail.com>
Date: Sun, 26 Dec 2021 23:02:45 +0100
Subject: [PATCH] chore: move data classes to correct namespaces

---
 Core/NosSmooth.Game/Data/Characters/Family.cs |   9 --
 Core/NosSmooth.Game/Data/Info/Position.cs     |  23 ++++
 .../Data/Inventory/InventoryItem.cs           |  12 ++
 Core/NosSmooth.Game/Data/Inventory/Item.cs    |  12 --
 Core/NosSmooth.Game/Data/Position.cs          |  14 ---
 Core/NosSmooth.Game/Data/Social/Family.cs     |  15 +++
 .../{Handlers => Core}/EventDispatcher.cs     | 103 +++++++++---------
 .../{Handlers => Core}/IGameResponder.cs      |  67 ++++++------
 8 files changed, 135 insertions(+), 120 deletions(-)
 delete mode 100644 Core/NosSmooth.Game/Data/Characters/Family.cs
 create mode 100644 Core/NosSmooth.Game/Data/Info/Position.cs
 create mode 100644 Core/NosSmooth.Game/Data/Inventory/InventoryItem.cs
 delete mode 100644 Core/NosSmooth.Game/Data/Inventory/Item.cs
 delete mode 100644 Core/NosSmooth.Game/Data/Position.cs
 create mode 100644 Core/NosSmooth.Game/Data/Social/Family.cs
 rename Core/NosSmooth.Game/Events/{Handlers => Core}/EventDispatcher.cs (92%)
 rename Core/NosSmooth.Game/Events/{Handlers => Core}/IGameResponder.cs (75%)

diff --git a/Core/NosSmooth.Game/Data/Characters/Family.cs b/Core/NosSmooth.Game/Data/Characters/Family.cs
deleted file mode 100644
index af894f8..0000000
--- a/Core/NosSmooth.Game/Data/Characters/Family.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-// 
-// Family.cs
-// 
-// Copyright (c) Christofel authors. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace NosSmooth.Game.Data.Character;
-
-public record Family();
\ No newline at end of file
diff --git a/Core/NosSmooth.Game/Data/Info/Position.cs b/Core/NosSmooth.Game/Data/Info/Position.cs
new file mode 100644
index 0000000..dae67b6
--- /dev/null
+++ b/Core/NosSmooth.Game/Data/Info/Position.cs
@@ -0,0 +1,23 @@
+//
+//  Position.cs
+//
+//  Copyright (c) František Boháček. All rights reserved.
+//  Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace NosSmooth.Game.Data.Info;
+
+/// <summary>
+/// Represents nostale position on map.
+/// </summary>
+public record Position
+{
+    /// <summary>
+    /// Gets the x coordinate.
+    /// </summary>
+    public long X { get; internal set; }
+
+    /// <summary>
+    /// Gets the y coordinate.
+    /// </summary>
+    public long Y { get; internal set; }
+}
\ No newline at end of file
diff --git a/Core/NosSmooth.Game/Data/Inventory/InventoryItem.cs b/Core/NosSmooth.Game/Data/Inventory/InventoryItem.cs
new file mode 100644
index 0000000..f31010d
--- /dev/null
+++ b/Core/NosSmooth.Game/Data/Inventory/InventoryItem.cs
@@ -0,0 +1,12 @@
+//
+//  InventoryItem.cs
+//
+//  Copyright (c) František Boháček. All rights reserved.
+//  Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace NosSmooth.Game.Data.Inventory;
+
+/// <summary>
+/// Represents item in bag inventory of the character.
+/// </summary>
+public record InventoryItem();
\ No newline at end of file
diff --git a/Core/NosSmooth.Game/Data/Inventory/Item.cs b/Core/NosSmooth.Game/Data/Inventory/Item.cs
deleted file mode 100644
index 5b40a07..0000000
--- a/Core/NosSmooth.Game/Data/Inventory/Item.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// 
-// Item.cs
-// 
-// Copyright (c) Christofel authors. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace NosSmooth.Game.Data.Inventory;
-
-public class Item
-{
-    
-}
\ No newline at end of file
diff --git a/Core/NosSmooth.Game/Data/Position.cs b/Core/NosSmooth.Game/Data/Position.cs
deleted file mode 100644
index ddc9d98..0000000
--- a/Core/NosSmooth.Game/Data/Position.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-//  Position.cs
-//
-//  Copyright (c) František Boháček. All rights reserved.
-//  Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace NosSmooth.Game.Data;
-
-/// <summary>
-/// Represents nostale positition on map.
-/// </summary>
-/// <param name="X">The x coordinate.</param>
-/// <param name="Y">The y coordinate.</param>
-public record Position(int X, int Y);
\ No newline at end of file
diff --git a/Core/NosSmooth.Game/Data/Social/Family.cs b/Core/NosSmooth.Game/Data/Social/Family.cs
new file mode 100644
index 0000000..82e7515
--- /dev/null
+++ b/Core/NosSmooth.Game/Data/Social/Family.cs
@@ -0,0 +1,15 @@
+//
+//  Family.cs
+//
+//  Copyright (c) František Boháček. All rights reserved.
+//  Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace NosSmooth.Game.Data.Social;
+
+/// <summary>
+/// Represents nostale family entity.
+/// </summary>
+/// <param name="Id">The id of the family.</param>
+/// <param name="Name">The name of the family.</param>
+/// <param name="Level">The level of the entity.</param>
+public record Family(string? Id, string? Name, byte Level);
\ No newline at end of file
diff --git a/Core/NosSmooth.Game/Events/Handlers/EventDispatcher.cs b/Core/NosSmooth.Game/Events/Core/EventDispatcher.cs
similarity index 92%
rename from Core/NosSmooth.Game/Events/Handlers/EventDispatcher.cs
rename to Core/NosSmooth.Game/Events/Core/EventDispatcher.cs
index ebc03b4..ff09c1e 100644
--- a/Core/NosSmooth.Game/Events/Handlers/EventDispatcher.cs
+++ b/Core/NosSmooth.Game/Events/Core/EventDispatcher.cs
@@ -1,51 +1,52 @@
-//
-//  EventDispatcher.cs
-//
-//  Copyright (c) František Boháček. All rights reserved.
-//  Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using Microsoft.Extensions.DependencyInjection;
-using Remora.Results;
-
-namespace NosSmooth.Game.Events.Handlers;
-
-/// <summary>
-/// Dispatches <see cref="IGameResponder"/> with <see cref="IGameEvent"/>.
-/// </summary>
-public class EventDispatcher
-{
-    private readonly IServiceProvider _provider;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="EventDispatcher"/> class.
-    /// </summary>
-    /// <param name="provider">The services provider.</param>
-    public EventDispatcher(IServiceProvider provider)
-    {
-        _provider = provider;
-    }
-
-    /// <summary>
-    /// Dispatches game responders that are registered in the service collection.
-    /// </summary>
-    /// <param name="event">The event to dispatch.</param>
-    /// <param name="ct">The cancellation token for cancelling the operation.</param>
-    /// <typeparam name="TEvent">The type of the event.</typeparam>
-    /// <returns>A result that may or may not have succeeded.</returns>
-    public async Task<Result> DispatchEvent<TEvent>(TEvent @event, CancellationToken ct = default)
-        where TEvent : IGameEvent
-    {
-        var results = await Task.WhenAll(
-            _provider
-                .GetServices<IGameResponder<TEvent>>()
-                .Select(responder => responder.Respond(@event, ct))
-        );
-
-        return results.Length switch
-        {
-            0 => Result.FromSuccess(),
-            1 => results[0],
-            _ => new AggregateError(results.Cast<IResult>().ToArray()),
-        };
-    }
-}
\ No newline at end of file
+//
+//  EventDispatcher.cs
+//
+//  Copyright (c) František Boháček. All rights reserved.
+//  Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.Extensions.DependencyInjection;
+using Remora.Results;
+
+namespace NosSmooth.Game.Events.Core;
+
+/// <summary>
+/// Dispatches <see cref="IGameResponder"/> with <see cref="IGameEvent"/>.
+/// </summary>
+public class EventDispatcher
+{
+    private readonly IServiceProvider _provider;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EventDispatcher"/> class.
+    /// </summary>
+    /// <param name="provider">The services provider.</param>
+    public EventDispatcher(IServiceProvider provider)
+    {
+        _provider = provider;
+    }
+
+    /// <summary>
+    /// Dispatches game responders that are registered in the service collection.
+    /// </summary>
+    /// <param name="event">The event to dispatch.</param>
+    /// <param name="ct">The cancellation token for cancelling the operation.</param>
+    /// <typeparam name="TEvent">The type of the event.</typeparam>
+    /// <returns>A result that may or may not have succeeded.</returns>
+    public async Task<Result> DispatchEvent<TEvent>(TEvent @event, CancellationToken ct = default)
+        where TEvent : IGameEvent
+    {
+        using var scope = _provider.CreateScope();
+        var results = await Task.WhenAll(
+            scope.ServiceProvider
+                .GetServices<IGameResponder<TEvent>>()
+                .Select(responder => responder.Respond(@event, ct))
+        );
+
+        return results.Length switch
+        {
+            0 => Result.FromSuccess(),
+            1 => results[0],
+            _ => new AggregateError(results.Cast<IResult>().ToArray()),
+        };
+    }
+}
diff --git a/Core/NosSmooth.Game/Events/Handlers/IGameResponder.cs b/Core/NosSmooth.Game/Events/Core/IGameResponder.cs
similarity index 75%
rename from Core/NosSmooth.Game/Events/Handlers/IGameResponder.cs
rename to Core/NosSmooth.Game/Events/Core/IGameResponder.cs
index b649b82..e578f4d 100644
--- a/Core/NosSmooth.Game/Events/Handlers/IGameResponder.cs
+++ b/Core/NosSmooth.Game/Events/Core/IGameResponder.cs
@@ -1,34 +1,33 @@
-//
-//  IGameResponder.cs
-//
-//  Copyright (c) František Boháček. All rights reserved.
-//  Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using OneOf.Types;
-using Remora.Results;
-
-namespace NosSmooth.Game.Events.Handlers;
-
-/// <summary>
-/// Represents interface for classes that respond to <see cref="IGameEvent"/>.
-/// </summary>
-public interface IGameResponder
-{
-}
-
-/// <summary>
-/// Represents interface for classes that respond to game events.
-/// Responds to <typeparamref name="TPacket"/>.
-/// </summary>
-/// <typeparam name="TEvent">The event type this responder responds to.</typeparam>
-public interface IGameResponder<TEvent> : IGameResponder
-    where TEvent : IGameEvent
-{
-    /// <summary>
-    /// Respond to the given packet.
-    /// </summary>
-    /// <param name="packet">The packet to respond to.</param>
-    /// <param name="ct">The cancellation token for cancelling the operation.</param>
-    /// <returns>A result that may or may not have succeeded.</returns>
-    public Task<Result> Respond(TEvent packet, CancellationToken ct = default);
-}
\ No newline at end of file
+//
+//  IGameResponder.cs
+//
+//  Copyright (c) František Boháček. All rights reserved.
+//  Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Remora.Results;
+
+namespace NosSmooth.Game.Events.Core;
+
+/// <summary>
+/// Represents interface for classes that respond to <see cref="IGameEvent"/>.
+/// </summary>
+public interface IGameResponder
+{
+}
+
+/// <summary>
+/// Represents interface for classes that respond to game events.
+/// Responds to <typeparamref name="TEvent"/>.
+/// </summary>
+/// <typeparam name="TEvent">The event type this responder responds to.</typeparam>
+public interface IGameResponder<TEvent> : IGameResponder
+    where TEvent : IGameEvent
+{
+    /// <summary>
+    /// Respond to the given packet.
+    /// </summary>
+    /// <param name="gameEvent">The packet to respond to.</param>
+    /// <param name="ct">The cancellation token for cancelling the operation.</param>
+    /// <returns>A result that may or may not have succeeded.</returns>
+    public Task<Result> Respond(TEvent gameEvent, CancellationToken ct = default);
+}
-- 
2.48.1