Add entities Device, and Source. Rename classes to Managers. Split Logic and Models.

Author: NiceOneFox

backend/ServiceSimulation/Bll.Domain/Bll.Domain.csproj

@@ -6,8 +6,4 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="Entities\" />
-  </ItemGroup>
-
 </Project>

backend/ServiceSimulation/Bll.Domain/Entities/Device.cs

@@ -1,40 +1,8 @@
-using Bll.Domain.Interfaces;
+namespace Bll.Domain.Entities;
 
-namespace Bll.Domain.Entities;
-
-public class Device : IDevice
+public class Device
 {
     public int DeviceId { get; set; }
     public bool IsWorking { get; set; }
     public Request? Request { get; set; }
-    private readonly ITimeProvider _time;
-    public Device(int deviceId, bool isWorking, Request? request, ITimeProvider time)
-    {
-        DeviceId = deviceId;
-        IsWorking = isWorking;
-        Request = request;
-        _time = time;
-    }
-
-    public void TakeRequest(Request request)
-    {
-        if (IsWorking)
-        {
-            return;
-        }
-        Request = request;
-
-        //TODO COUNT TIME OF WORKING ON THAT REQUEST
-    }
-
-    public bool IsFree()
-    {
-        if (Request?.EndTime <= _time.Now)
-        {
-            Request = null;
-            IsWorking = false;
-            // TODO COUNT THAT REQUEST WHICH IS END WORKING.
-        }
-        return true;
-    }
 }

backend/ServiceSimulation/Bll.Domain/Entities/DeviceManager.cs

@@ -0,0 +1,34 @@
+using Bll.Domain.Interfaces;
+
+namespace Bll.Domain.Entities;
+
+public class DeviceManager : IDeviceManager
+{
+    private readonly ITimeProvider _time;
+    public DeviceManager(ITimeProvider time)
+    {
+        _time = time;
+    }
+
+    public void TakeRequest(Request request, Device device)
+    {
+        if (device.IsWorking)
+        {
+            return;
+        }
+        device.Request = request;
+
+        //TODO COUNT TIME OF WORKING ON THAT REQUEST
+    }
+
+    public bool IsFree(Device device)
+    {
+        if (device.Request?.EndTime <= _time.Now)
+        {
+            device.Request = null;
+            device.IsWorking = false;
+            // TODO COUNT THAT REQUEST WHICH IS END WORKING.
+        }
+        return true;
+    }
+}

backend/ServiceSimulation/Bll.Domain/Entities/Request.cs

@@ -16,5 +16,5 @@ public Request(int numberOfSource, int serialNumberOfSource, DateTime startTime,
     }
 
     public override string ToString()
-        => "Time: " + StartTime + " №source: " + NumberOfSource + "-" + SerialNumberOfSource;
+        => "Time: " + StartTime + " №sourceManager: " + NumberOfSource + "-" + SerialNumberOfSource;
 }

backend/ServiceSimulation/Bll.Domain/Entities/Source.cs

@@ -1,25 +1,8 @@
-using Bll.Domain.Interfaces;
+namespace Bll.Domain.Entities;
 
-namespace Bll.Domain.Entities;
-
-public class Source : ISource
+public class Source
 {
     public int SourceId { get; set; }
     public int Priority { get; set; }
     public int SerialNumber { get; set; }
-    public ITimeProvider Time { get; set; }
-    public Source(int sourceId, int priority, int serialNumber, ITimeProvider time)
-    {
-        SourceId = sourceId;
-        Priority = priority;
-        SerialNumber = serialNumber;
-        Time = time;
-    }
-
-    public Request GetNewRequest()
-    {
-        var generatedRequest = new Request(SourceId, SerialNumber, Time.Now, DateTime.Now.AddMilliseconds(5.0));
-        SerialNumber++;
-        return generatedRequest;
-    }
 }

backend/ServiceSimulation/Bll.Domain/Entities/SourceManager.cs

@@ -0,0 +1,19 @@
+using Bll.Domain.Interfaces;
+
+namespace Bll.Domain.Entities;
+
+public class SourceManager : ISourceManager
+{
+    public ITimeProvider Time { get; set; }
+    public SourceManager(ITimeProvider time)
+    {
+        Time = time;
+    }
+
+    public Request GetNewRequest(Source source)
+    {
+        var generatedRequest = new Request(source.SourceId, source.SerialNumber, Time.Now, DateTime.Now.AddMilliseconds(5.0));
+        source.SerialNumber++;
+        return generatedRequest;
+    }
+}

backend/ServiceSimulation/Bll.Domain/Interfaces/IDevice.cs

@@ -0,0 +1,9 @@
+using Bll.Domain.Entities;
+
+namespace Bll.Domain.Interfaces;
+
+public interface IDeviceManager
+{
+    void TakeRequest(Request request, Device device);
+    bool IsFree(Device device);
+}

backend/ServiceSimulation/Bll.Domain/Interfaces/IDeviceManager.cs

@@ -0,0 +1,8 @@
+using Bll.Domain.Entities;
+
+namespace Bll.Domain.Interfaces;
+
+public interface ISourceManager
+{
+    Request GetNewRequest(Source source);
+}