Merge pull request #6 from NiceOneFox/T6_Add_ServiceSimulation

NiceOneFox · web-flow · commit c930c3224658 · 2022-04-19T22:15:14.000+03:00
Close T6 add service simulation
diff --git a/backend/ServiceSimulation/Bll.Domain/Bll.Domain.csproj b/backend/ServiceSimulation/Bll.Domain/Bll.Domain.csproj
@@ -1,14 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="Entities\" />
-    <Folder Include="Interfaces\" />
-  </ItemGroup>
-
 </Project>
diff --git a/backend/ServiceSimulation/Bll.Domain/Entities/Buffer.cs b/backend/ServiceSimulation/Bll.Domain/Entities/Buffer.cs
@@ -1,5 +1,5 @@
 ﻿using Bll.Domain.Factories;
-using Bll.Domain.Services;
+using Bll.Domain.Interfaces;
 
 namespace Bll.Domain.Entities;
 
diff --git a/backend/ServiceSimulation/Bll.Domain/Entities/BufferManagerFactory.cs b/backend/ServiceSimulation/Bll.Domain/Entities/BufferManagerFactory.cs
@@ -1,5 +1,5 @@
 ﻿using Bll.Domain.Factories;
-using Bll.Domain.Services;
+using Bll.Domain.Interfaces;
 
 namespace Bll.Domain.Entities;
 
diff --git a/backend/ServiceSimulation/Bll.Domain/Entities/Device.cs b/backend/ServiceSimulation/Bll.Domain/Entities/Device.cs
@@ -1,41 +1,8 @@
-﻿using Bll.Domain.Interfaces;
-using Bll.Domain.Services;
+﻿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;
-    }
 }
diff --git a/backend/ServiceSimulation/Bll.Domain/Entities/DeviceManager.cs b/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;
+    }
+}
diff --git a/backend/ServiceSimulation/Bll.Domain/Entities/Request.cs b/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;
 }
diff --git a/backend/ServiceSimulation/Bll.Domain/Entities/Source.cs b/backend/ServiceSimulation/Bll.Domain/Entities/Source.cs
@@ -1,26 +1,8 @@
-﻿using Bll.Domain.Interfaces;
-using Bll.Domain.Services;
+﻿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;
-    }
 }
diff --git a/backend/ServiceSimulation/Bll.Domain/Entities/SourceManager.cs b/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;
+    }
+}
diff --git a/backend/ServiceSimulation/Bll.Domain/Entities/StandardBufferManager.cs b/backend/ServiceSimulation/Bll.Domain/Entities/StandardBufferManager.cs
@@ -1,4 +1,4 @@
-﻿using Bll.Domain.Services;
+﻿using Bll.Domain.Interfaces;
 
 namespace Bll.Domain.Entities;
 
diff --git a/backend/ServiceSimulation/Bll.Domain/Entities/TimeProvider.cs b/backend/ServiceSimulation/Bll.Domain/Entities/TimeProvider.cs
@@ -0,0 +1,8 @@
+﻿using Bll.Domain.Interfaces;
+
+namespace Bll.Domain.Entities;
+
+public class TimeProvider : ITimeProvider
+{
+    public DateTime Now { get; } = DateTime.Now;
+}
diff --git a/backend/ServiceSimulation/Bll.Domain/Factories/IBufferManagerFactory.cs b/backend/ServiceSimulation/Bll.Domain/Factories/IBufferManagerFactory.cs
@@ -1,4 +1,4 @@
-﻿using Bll.Domain.Services;
+﻿using Bll.Domain.Interfaces;
 
 namespace Bll.Domain.Factories;
 
diff --git a/backend/ServiceSimulation/Bll.Domain/Interfaces/IBuffer.cs b/backend/ServiceSimulation/Bll.Domain/Interfaces/IBuffer.cs
@@ -1,6 +1,6 @@
 ﻿using Bll.Domain.Entities;
 
-namespace Bll.Domain.Services;
+namespace Bll.Domain.Interfaces;
 
 public interface IBuffer
 {
diff --git a/backend/ServiceSimulation/Bll.Domain/Interfaces/IBufferManager.cs b/backend/ServiceSimulation/Bll.Domain/Interfaces/IBufferManager.cs
@@ -1,6 +1,6 @@
 ﻿using Bll.Domain.Entities;
 
-namespace Bll.Domain.Services;
+namespace Bll.Domain.Interfaces;
 
 public interface IBufferManager
 {
diff --git a/backend/ServiceSimulation/Bll.Domain/Interfaces/IDeviceManager.cs b/backend/ServiceSimulation/Bll.Domain/Interfaces/IDeviceManager.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);
+}
diff --git a/backend/ServiceSimulation/Bll.Domain/Interfaces/ISimulationService.cs b/backend/ServiceSimulation/Bll.Domain/Interfaces/ISimulationService.cs
@@ -0,0 +1,8 @@
+﻿using Api.enums;
+
+namespace Bll.Domain.Interfaces;
+
+public interface ISimulationService
+{
+    void StartSimulation(SimulationType simulationType);
+}
diff --git a/backend/ServiceSimulation/Bll.Domain/Interfaces/ISourceManager.cs b/backend/ServiceSimulation/Bll.Domain/Interfaces/ISourceManager.cs
@@ -0,0 +1,8 @@
+﻿using Bll.Domain.Entities;
+
+namespace Bll.Domain.Interfaces;
+
+public interface ISourceManager
+{
+    Request GetNewRequest(Source source);
+}
diff --git a/backend/ServiceSimulation/Bll.Domain/Services/IDevice.cs b/backend/ServiceSimulation/Bll.Domain/Services/IDevice.cs
diff --git a/backend/ServiceSimulation/Bll.Domain/Services/ISource.cs b/backend/ServiceSimulation/Bll.Domain/Services/ISource.cs
diff --git a/backend/ServiceSimulation/Bll.Domain/Services/SimulationService.cs b/backend/ServiceSimulation/Bll.Domain/Services/SimulationService.cs
@@ -0,0 +1,40 @@
+﻿using Api.enums;
+using Bll.Domain.Entities;
+using Bll.Domain.Interfaces;
+
+namespace Bll.Domain.Services;
+
+public class SimulationService : ISimulationService
+{
+    private readonly ISourceManager _sourceManager;
+    private readonly IBuffer _buffer;
+    private readonly IDeviceManager _deviceManager;
+
+    public SimulationService(ISourceManager sourceManager, IBuffer buffer, IDeviceManager deviceManager)
+    {
+        _sourceManager = sourceManager;
+        _buffer = buffer;
+        _deviceManager = deviceManager;
+    }
+
+    public void StartSimulation(SimulationType simulationType)
+    {
+        // TODO CHOSE NUMBER OF SOURCES, SIZE OF BUFFER, NUMBER OF DEVICES.
+
+        // TODO ALGORITHM OF CHOOSING REQUEST FROM SOURCE AND PUT IT ON DEVICE
+        var source = new Source();
+        var device = new Device();
+
+        var request =_sourceManager.GetNewRequest(source);
+
+        _buffer.Push(request);
+
+        var requestFromBuffer = _buffer.Pop();
+
+        if (requestFromBuffer == null) return;
+
+        _deviceManager.TakeRequest(requestFromBuffer, device);
+
+        // TODO MAKE SOME KIND OF JSON ANSWER.
+    }
+}
diff --git a/backend/ServiceSimulation/Bll.Domain/enums/SimulationType.cs b/backend/ServiceSimulation/Bll.Domain/enums/SimulationType.cs
@@ -0,0 +1,6 @@
+﻿namespace Api.enums;
+
+public enum SimulationType
+{
+    Standard = 0
+}
diff --git a/backend/ServiceSimulation/WebApplication2/Api.csproj b/backend/ServiceSimulation/WebApplication2/Api.csproj
@@ -12,6 +12,11 @@
 
   <ItemGroup>
     <Folder Include="Controllers\" />
+    <Folder Include="Models\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Bll.Domain\Bll.Domain.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/backend/ServiceSimulation/WebApplication2/Controllers/Simulation.cs b/backend/ServiceSimulation/WebApplication2/Controllers/Simulation.cs
@@ -1,13 +1,23 @@
-﻿using Microsoft.AspNetCore.Mvc;
+﻿using Api.enums;
+using Bll.Domain.Interfaces;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Api.Controllers;
 
 [Route("simulation")]
 public class Simulation : Controller
 {
+    private readonly ISimulationService _simulationService;
+
+    public Simulation(ISimulationService simulationService)
+    {
+        _simulationService = simulationService;
+    }
+
     [HttpGet("/start")]
-    public IActionResult Start()
+    public IActionResult Start(SimulationType simulationType)
     {
+        _simulationService.StartSimulation(simulationType);
         return Ok("Simulation answer");
     }
 }
diff --git a/backend/ServiceSimulation/WebApplication2/Program.cs b/backend/ServiceSimulation/WebApplication2/Program.cs
@@ -1,9 +1,27 @@
+using Bll.Domain.Entities;
+using Bll.Domain.Factories;
+using Bll.Domain.Interfaces;
+using Bll.Domain.Services;
+using Buffer = Bll.Domain.Entities.Buffer;
+
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Services.AddControllers();
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
 
+#region servicesDI
+builder.Services.AddTransient<ISimulationService, SimulationService>();
+
+builder.Services.AddTransient<ITimeProvider, TimeProvider>();
+builder.Services.AddTransient<IBuffer, Buffer>();
+builder.Services.AddTransient<IBufferManager, StandardBufferManager>();
+builder.Services.AddTransient<IBufferManagerFactory, BufferManagerFactory>();
+builder.Services.AddTransient<IDeviceManager, DeviceManager>();
+builder.Services.AddTransient<ISourceManager, SourceManager>();
+
+#endregion
+
 var app = builder.Build();
 
 if (app.Environment.IsDevelopment())

Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,5 @@ public Request(int numberOfSource, int serialNumberOfSource, DateTime startTime,`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public override string ToString()`
`19`		`- => "Time: " + StartTime + " №source: " + NumberOfSource + "-" + SerialNumberOfSource;`
	`19`	`+ => "Time: " + StartTime + " №sourceManager: " + NumberOfSource + "-" + SerialNumberOfSource;`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using Bll.Domain.Services;`
	`1`	`+using Bll.Domain.Interfaces;`
`2`	`2`
`3`	`3`	`namespace Bll.Domain.Entities;`
`4`	`4`