Add AutoMapper. Fix Simulation depends on Time or Amount Requests

Author: NiceOneFox

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

@@ -30,6 +30,7 @@ public void TakeRequest(Request request, Device device)
 
     public bool FreeDevice(Device device)
     {
+        _ = device ?? throw new ArgumentNullException(nameof(device));
         device.Request.EndTime = _time.Now;
 
         _time.Now = device.Request.EndTime;

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

@@ -0,0 +1,8 @@
+namespace Bll.Domain.Entities;
+
+public record FinalResults
+{
+    public double AverageProbabilityOfMaintenance { get; init; }
+    public double BandwidthOfSystem { get; init; }
+    public double ProbabilityOfFailure { get; init; }
+};

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

@@ -4,6 +4,15 @@ namespace Bll.Domain.Entities;
 
 public class ResultManager : IResultManager
 {
+    private readonly IResults _results;
+    private readonly ITimeProvider _timeProvider;
+
+    public ResultManager(IResults results, ITimeProvider timeProvider)
+    {
+        _results = results;
+        _timeProvider = timeProvider;
+    }
+
     public double AverageProbabilityOfMaintenance(int amountOfServedRequests, int totalAmountOfRequests)
     {
         return amountOfServedRequests / (double)totalAmountOfRequests;
@@ -18,4 +27,17 @@ public double ProbabilityOfFailure(int amountOfDeclinedRequests, int totalAmount
     {
         return amountOfDeclinedRequests / (double)totalAmountOfRequests;
     }
+
+    public FinalResults CalculateResultsOfModeling()
+    {
+        _results.ModelingTime = _timeProvider.Now;
+        return new FinalResults
+        {
+            AverageProbabilityOfMaintenance = AverageProbabilityOfMaintenance(_results.AmountOfServedRequest,
+                _results.AmountOfGeneratedRequests),
+            BandwidthOfSystem = BandwidthOfSystem(_results.AmountOfServedRequest, _results.ModelingTime),
+            ProbabilityOfFailure = ProbabilityOfFailure(_results.Cancelled.Count,
+                _results.AmountOfGeneratedRequests),
+        };
+    }
 }

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

@@ -1,4 +1,6 @@
-namespace Bll.Domain.Interfaces;
+using Bll.Domain.Entities;
+
+namespace Bll.Domain.Interfaces;
 
 public interface IResultManager
 {
@@ -16,4 +18,5 @@ public interface IResultManager
     /// P failire of request = N declined / N total
     /// </summary>
     double ProbabilityOfFailure(int amountOfDeclinedRequests, int totalAmountOfRequests);
+    public FinalResults CalculateResultsOfModeling();
 }

backend/ServiceSimulation/Bll.Domain/Services/SimulationService.cs

@@ -11,13 +11,18 @@ public class SimulationService : ISimulationService
     private readonly IDeviceManager _deviceManager;
     private readonly IBufferManagerFactory _bufferManagerFactory;
     private readonly IResults _results;
-
-    public SimulationService(ISourceManager sourceManager, IDeviceManager deviceManager, IBufferManagerFactory bufferManagerFactory, IResults results)
+    private readonly ITimeProvider _time;
+    public SimulationService(ISourceManager sourceManager, 
+        IDeviceManager deviceManager, 
+        IBufferManagerFactory bufferManagerFactory, 
+        IResults results, 
+        ITimeProvider time)
     {
         _sourceManager = sourceManager;
         _deviceManager = deviceManager;
         _bufferManagerFactory = bufferManagerFactory;
         _results = results;
+        _time = time;
     }
 
     public void StartSimulation(InputParameters parameters)
@@ -60,8 +65,9 @@ public void StartSimulation(InputParameters parameters)
         {
             if (_results.AmountOfGeneratedRequests >= parameters.AmountOfRequests &&
                 bufferManager.IsFree() &&
-                IsAllDevicesFree(devices) &&
-                _results.AmountOfServedRequest == parameters.AmountOfRequests) // TODO CHECK FOR REQUESTS ON SOURCES. WHEN TO END SYSTEM MODELING
+                IsAllDevicesFree(devices) || 
+                _time.Now >= parameters.ModelingTime)
+               // _results.AmountOfServedRequest == parameters.AmountOfRequests) // TODO CHECK FOR REQUESTS ON SOURCES. WHEN TO END SYSTEM MODELING
             {
                 break;
             }
@@ -77,7 +83,7 @@ private void FindNextSpecialEvent(List<Device> devices, List<Source> sources, IB
         int indexOfRequestWithClosestTimeCome = -1;
         for (int i = 0; i < sources.Count; i++)
         {
-            if (_results.AmountOfGeneratedRequests >= parameters.AmountOfRequests) break;
+           // if (_results.AmountOfGeneratedRequests >= parameters.AmountOfRequests) break;
             if (sources[i].TimeOfNextRequest < timeOfClosestRequestCome)
             {
                 timeOfClosestRequestCome = sources[i].TimeOfNextRequest;
@@ -95,7 +101,8 @@ private void FindNextSpecialEvent(List<Device> devices, List<Source> sources, IB
             }
         }
 
-        if (timeOfClosestDeviceFree < timeOfClosestRequestCome)
+        if (timeOfClosestDeviceFree < timeOfClosestRequestCome 
+            || _results.AmountOfGeneratedRequests == parameters.AmountOfRequests)
         {
             _deviceManager.FreeDevice(devices[indexOfDeviceWithClosestTimeFree]);
 
@@ -108,7 +115,7 @@ private void FindNextSpecialEvent(List<Device> devices, List<Source> sources, IB
         else
         {
             // Take request on work or add to buffer.
-            if (_results.AmountOfGeneratedRequests >= parameters.AmountOfRequests) return;
+            //if (_results.AmountOfGeneratedRequests >= parameters.AmountOfRequests) return;
 
             var newRequestInSystem = _sourceManager.GetNewRequest(sources[indexOfRequestWithClosestTimeCome]);
             // find out free device

backend/ServiceSimulation/WebApplication2/Api.csproj

@@ -7,13 +7,14 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="AutoMapper" Version="11.0.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.0" />
   </ItemGroup>
 
   <ItemGroup>
     <Folder Include="Controllers\" />
-    <Folder Include="Models\" />
     <Folder Include="Entities\" />
+    <Folder Include="Configuration\" />
   </ItemGroup>
 
   <ItemGroup>

backend/ServiceSimulation/WebApplication2/Configuration/ApiMapperConfigurator.cs

@@ -0,0 +1,27 @@
+using Api.Entities;
+using AutoMapper;
+using Bll.Domain.Entities;
+using Bll.Domain.Interfaces;
+
+namespace Api.Configuration;
+
+public class ApiMapperConfigurator
+{
+    private readonly IMapperConfigurationExpression _expression;
+    public IMapperConfigurationExpression AddConfiguration() => _expression;
+
+    public ApiMapperConfigurator(IMapperConfigurationExpression expression)
+    {
+        MappingApiResults(expression);
+
+        _expression = expression;
+    }
+
+    private void MappingApiResults(IMapperConfigurationExpression expression)
+    {
+        expression.CreateMap<(FinalResults, IResults), ApiResults>()
+            .ForMember(dst => dst.AverageProbabilityOfMaintenance, 
+                opt => opt.MapFrom(src => src.Item1.AverageProbabilityOfMaintenance));
+        //TODO CONTINUE MAP MEMBERS
+    }
+}

backend/ServiceSimulation/WebApplication2/Configuration/MapperRegistration.cs

@@ -0,0 +1,17 @@
+using AutoMapper;
+
+namespace Api.Configuration;
+
+public static class MapperRegistration
+{
+    public static void AddMapper(this IServiceCollection services)
+    {
+        var mapper = new MapperConfiguration(cfg => cfg.AddApi());
+
+        services.AddSingleton(mapper.CreateMapper());
+    }
+    public static IMapperConfigurationExpression AddApi(this IMapperConfigurationExpression expression)
+    {
+        return new ApiMapperConfigurator(expression).AddConfiguration();
+    }
+}

backend/ServiceSimulation/WebApplication2/Controllers/Simulation.cs

@@ -1,4 +1,6 @@
-using Api.enums;
+using Api.Entities;
+using Api.enums;
+using AutoMapper;
 using Bll.Domain.Entities;
 using Bll.Domain.Interfaces;
 using Microsoft.AspNetCore.Mvc;
@@ -11,19 +13,23 @@ public class Simulation : Controller
     private readonly ISimulationService _simulationService;
     private readonly ITimeProvider _time;
     private readonly IResults _results;
-
-    public Simulation(ISimulationService simulationService, ITimeProvider time, IResults results)
+    private readonly IResultManager _resultManager;
+    private readonly IMapper _mapper;
+    public Simulation(ISimulationService simulationService, ITimeProvider time, IResults results, IResultManager resultManager, IMapper mapper)
     {
         _simulationService = simulationService;
         _time = time;
         _results = results;
+        _resultManager = resultManager;
+        _mapper = mapper;
     }
 
     [HttpGet("/start")]
     public IActionResult Start(InputParameters parameters)
     {
         _simulationService.StartSimulation(parameters);
-        _results.ModelingTime = _time.Now; // TODO Add AutoMapper
-        return Ok(_results);
+        var endResultsOfModeling = _resultManager.CalculateResultsOfModeling();
+        var apiResults = _mapper.Map<ApiResults>((endResultsOfModeling, _results)); // TODO OTHER PARAMS>?
+        return Ok(apiResults); // TODO AUTOMAPPER CONFIGURATION!
     }
 }

backend/ServiceSimulation/WebApplication2/Entities/ApiResults.cs

@@ -0,0 +1,13 @@
+using Bll.Domain.Entities;
+
+namespace Api.Entities;
+
+public record ApiResults
+{
+    public double ModelingTime { get; init; }
+    public int AmountOfGeneratedRequests { get; init; }
+    public int AmountOfServedRequest { get; init; }
+    public double AverageProbabilityOfMaintenance { get; init; }
+    public double BandwidthOfSystem { get; init; }
+    public double ProbabilityOfFailure { get; init; }
+}