Merge pull request #14 from NiceOneFox/T10_AutoMapper_Configuration_For_Results

NiceOneFox · web-flow · commit a73ca1efc8b1 · 2022-04-26T23:32:29.000+03:00
Close Add Autommaper config. modify buffernanager factory
diff --git a/backend/ServiceSimulation/Api/Configuration/ApiMapperConfigurator.cs b/backend/ServiceSimulation/Api/Configuration/ApiMapperConfigurator.cs
@@ -20,8 +20,18 @@ public ApiMapperConfigurator(IMapperConfigurationExpression 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
+            .ForMember(dst => dst.AverageProbabilityOfMaintenance,
+                opt => opt.MapFrom(src => src.Item1.AverageProbabilityOfMaintenance))
+            .ForMember(dst => dst.ProbabilityOfFailure,
+                opt => opt.MapFrom(src => src.Item1.ProbabilityOfFailure))
+            .ForMember(dst => dst.BandwidthOfSystem,
+                opt => opt.MapFrom(src => src.Item1.BandwidthOfSystem))
+            .ForMember(dst => dst.AmountOfGeneratedRequests,
+
+                opt => opt.MapFrom(src => src.Item2.AmountOfGeneratedRequests))
+            .ForMember(dst => dst.AmountOfServedRequest,
+                opt => opt.MapFrom(src => src.Item2.AmountOfServedRequest))
+            .ForMember(dst => dst.ModelingTime,
+                opt => opt.MapFrom(src => src.Item2.ModelingTime));
     }
 }
diff --git a/backend/ServiceSimulation/Api/Controllers/Simulation.cs b/backend/ServiceSimulation/Api/Controllers/Simulation.cs
@@ -16,8 +16,9 @@ public class Simulation : Controller
     private readonly IResultManager _resultManager;
     private readonly IMapper _mapper;
     public Simulation(ISimulationService simulationService, 
-        ITimeProvider time, IResults results, 
-        IResultManager resultManager, 
+        ITimeProvider time, 
+        IResults results,
+        IResultManager resultManager,
         IMapper mapper)
     {
         _simulationService = simulationService;
@@ -32,7 +33,8 @@ public IActionResult Start(InputParameters parameters)
     {
         _simulationService.StartSimulation(parameters);
         var endResultsOfModeling = _resultManager.CalculateResultsOfModeling();
-        var apiResults = _mapper.Map<ApiResults>((endResultsOfModeling, _results)); // TODO OTHER PARAMS>?
-        return Ok(apiResults); // TODO AUTOMAPPER CONFIGURATION!
+        var apiResults = _mapper.Map<ApiResults>((endResultsOfModeling, _results));
+
+        return Ok(apiResults);
     }
 }
diff --git a/backend/ServiceSimulation/Bll.Domain/Entities/BufferManagerFactory.cs b/backend/ServiceSimulation/Bll.Domain/Entities/BufferManagerFactory.cs
@@ -15,19 +15,12 @@ public BufferManagerFactory(IServiceProvider serviceProvider)
         _serviceProvider = serviceProvider;
     }
 
-    public IBufferManager CreateBufferManager(SimulationType simulationType) // TODO PASS MORE PARAMETERS. SIZE BUFFER
+    public IBufferManager CreateBufferManager(SimulationType simulationType, int capacity)
     {
-       // var a = ActivatorUtilities.CreateInstance<IBufferManager>(_serviceProvider, 
-       //     new StandardBufferManager(_serviceProvider.GetRequiredService<IResults>(),
-        //        _serviceProvider.GetRequiredService<ITimeProvider>(), 5));
-        
         return simulationType switch
         {
-            0 => new StandardBufferManager(_serviceProvider.GetRequiredService<IResults>(), _serviceProvider.GetRequiredService<ITimeProvider>(), 5),
-            //0 => (IBufferManager)_serviceProvider.GetRequiredService(typeof(StandardBufferManager)),
-            //0 => Activator.CreateInstance<IBufferManager>(nameof(StandardBufferManager), 5),// (IBufferManager)_serviceProvider.GetService(typeof(StandardBufferManager)),
-            // 0 => ActivatorUtilities.CreateInstance<IBufferManager>(_serviceProvider,
-            //    new StandardBufferManager(_serviceProvider.GetRequiredService<IResults>(), _serviceProvider.GetRequiredService<ITimeProvider>())),
+            0 => new StandardBufferManager(_serviceProvider.GetRequiredService<IResults>(),
+                _serviceProvider.GetRequiredService<ITimeProvider>(), capacity),
             _ => throw new NotImplementedException()
         };
     }
diff --git a/backend/ServiceSimulation/Bll.Domain/Entities/InputParameters.cs b/backend/ServiceSimulation/Bll.Domain/Entities/InputParameters.cs
@@ -10,6 +10,5 @@ public class InputParameters
     public int AmountOfRequests { get; set; } = 40;
     public double ModelingTime { get; set; } = double.MaxValue;
     public SimulationType SimulationType { get; set; } = SimulationType.Standard;
-
     public double Lambda { get; set; } = 3;
 }
diff --git a/backend/ServiceSimulation/Bll.Domain/Entities/SourceManager.cs b/backend/ServiceSimulation/Bll.Domain/Entities/SourceManager.cs
@@ -29,4 +29,4 @@ public Request GetNewRequest(Source source)
 
         return generatedRequest;
     }
-}
+} // TODO Add Method Take NewRequest And GetTimeOfNextRequest ?
diff --git a/backend/ServiceSimulation/Bll.Domain/Factories/IBufferManagerFactory.cs b/backend/ServiceSimulation/Bll.Domain/Factories/IBufferManagerFactory.cs
@@ -5,5 +5,5 @@ namespace Bll.Domain.Factories;
 
 public interface IBufferManagerFactory
 {
-    IBufferManager CreateBufferManager(SimulationType simulationType);
+    IBufferManager CreateBufferManager(SimulationType simulationType, int capacity);
 }
diff --git a/backend/ServiceSimulation/Bll.Domain/Services/SimulationService.cs b/backend/ServiceSimulation/Bll.Domain/Services/SimulationService.cs
@@ -54,7 +54,7 @@ public void StartSimulation(InputParameters parameters)
             });
         }
 
-        var bufferManager = _bufferManagerFactory.CreateBufferManager(parameters.SimulationType);
+        var bufferManager = _bufferManagerFactory.CreateBufferManager(parameters.SimulationType, parameters.BufferSize);
         
         foreach (var source in sources) // Generate first requests that generated by sources.
         {
diff --git a/backend/ServiceSimulation/ServiceSimulation.sln b/backend/ServiceSimulation/ServiceSimulation.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 17.1.32210.238
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bll.Domain", "Bll.Domain\Bll.Domain.csproj", "{A2F40071-9955-4AB9-9C6E-6BB2B34BC580}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api", "Api\Api.csproj", "{22B0B8F3-C889-42A4-AE31-C858C99EDEFF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api", "Api\Api.csproj", "{454394BA-843E-47C5-A8A1-358D5629EEFC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,10 +17,10 @@ Global
 		{A2F40071-9955-4AB9-9C6E-6BB2B34BC580}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A2F40071-9955-4AB9-9C6E-6BB2B34BC580}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A2F40071-9955-4AB9-9C6E-6BB2B34BC580}.Release|Any CPU.Build.0 = Release|Any CPU
-		{22B0B8F3-C889-42A4-AE31-C858C99EDEFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{22B0B8F3-C889-42A4-AE31-C858C99EDEFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{22B0B8F3-C889-42A4-AE31-C858C99EDEFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{22B0B8F3-C889-42A4-AE31-C858C99EDEFF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{454394BA-843E-47C5-A8A1-358D5629EEFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{454394BA-843E-47C5-A8A1-358D5629EEFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{454394BA-843E-47C5-A8A1-358D5629EEFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{454394BA-843E-47C5-A8A1-358D5629EEFC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,9 @@ public class Simulation : Controller`
`16`	`16`	`private readonly IResultManager _resultManager;`
`17`	`17`	`private readonly IMapper _mapper;`
`18`	`18`	`public Simulation(ISimulationService simulationService,`
`19`		`- ITimeProvider time, IResults results,`
`20`		`- IResultManager resultManager,`
	`19`	`+ ITimeProvider time,`
	`20`	`+ IResults results,`
	`21`	`+ IResultManager resultManager,`
`21`	`22`	`IMapper mapper)`
`22`	`23`	`{`
`23`	`24`	`_simulationService = simulationService;`
`@@ -32,7 +33,8 @@ public IActionResult Start(InputParameters parameters)`
`32`	`33`	`{`
`33`	`34`	`_simulationService.StartSimulation(parameters);`
`34`	`35`	`var endResultsOfModeling = _resultManager.CalculateResultsOfModeling();`
`35`		`- var apiResults = _mapper.Map<ApiResults>((endResultsOfModeling, _results)); // TODO OTHER PARAMS>?`
`36`		`- return Ok(apiResults); // TODO AUTOMAPPER CONFIGURATION!`
	`36`	`+ var apiResults = _mapper.Map<ApiResults>((endResultsOfModeling, _results));`
	`37`	`+`
	`38`	`+ return Ok(apiResults);`
`37`	`39`	`}`
`38`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,19 +15,12 @@ public BufferManagerFactory(IServiceProvider serviceProvider)`
`15`	`15`	`_serviceProvider = serviceProvider;`
`16`	`16`	`}`
`17`	`17`
`18`		`- public IBufferManager CreateBufferManager(SimulationType simulationType) // TODO PASS MORE PARAMETERS. SIZE BUFFER`
	`18`	`+ public IBufferManager CreateBufferManager(SimulationType simulationType, int capacity)`
`19`	`19`	`{`
`20`		`- // var a = ActivatorUtilities.CreateInstance<IBufferManager>(_serviceProvider,`
`21`		`- // new StandardBufferManager(_serviceProvider.GetRequiredService<IResults>(),`
`22`		`- // _serviceProvider.GetRequiredService<ITimeProvider>(), 5));`
`23`		`-`
`24`	`20`	`return simulationType switch`
`25`	`21`	`{`
`26`		`- 0 => new StandardBufferManager(_serviceProvider.GetRequiredService<IResults>(), _serviceProvider.GetRequiredService<ITimeProvider>(), 5),`
`27`		`- //0 => (IBufferManager)_serviceProvider.GetRequiredService(typeof(StandardBufferManager)),`
`28`		`- //0 => Activator.CreateInstance<IBufferManager>(nameof(StandardBufferManager), 5),// (IBufferManager)_serviceProvider.GetService(typeof(StandardBufferManager)),`
`29`		`- // 0 => ActivatorUtilities.CreateInstance<IBufferManager>(_serviceProvider,`
`30`		`- // new StandardBufferManager(_serviceProvider.GetRequiredService<IResults>(), _serviceProvider.GetRequiredService<ITimeProvider>())),`
	`22`	`+ 0 => new StandardBufferManager(_serviceProvider.GetRequiredService<IResults>(),`
	`23`	`+ _serviceProvider.GetRequiredService<ITimeProvider>(), capacity),`
`31`	`24`	`_ => throw new NotImplementedException()`
`32`	`25`	`};`
`33`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,5 @@ public class InputParameters`
`10`	`10`	`public int AmountOfRequests { get; set; } = 40;`
`11`	`11`	`public double ModelingTime { get; set; } = double.MaxValue;`
`12`	`12`	`public SimulationType SimulationType { get; set; } = SimulationType.Standard;`
`13`		`-`
`14`	`13`	`public double Lambda { get; set; } = 3;`
`15`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,4 @@ public Request GetNewRequest(Source source)`
`29`	`29`
`30`	`30`	`return generatedRequest;`
`31`	`31`	`}`
`32`		`-}`
	`32`	`+} // TODO Add Method Take NewRequest And GetTimeOfNextRequest ?`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ namespace Bll.Domain.Factories;`
`5`	`5`
`6`	`6`	`public interface IBufferManagerFactory`
`7`	`7`	`{`
`8`		`- IBufferManager CreateBufferManager(SimulationType simulationType);`
	`8`	`+ IBufferManager CreateBufferManager(SimulationType simulationType, int capacity);`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public void StartSimulation(InputParameters parameters)`
`54`	`54`	`});`
`55`	`55`	`}`
`56`	`56`
`57`		`- var bufferManager = _bufferManagerFactory.CreateBufferManager(parameters.SimulationType);`
	`57`	`+ var bufferManager = _bufferManagerFactory.CreateBufferManager(parameters.SimulationType, parameters.BufferSize);`
`58`	`58`
`59`	`59`	`foreach (var source in sources) // Generate first requests that generated by sources.`
`60`	`60`	`{`