Merge pull request #15 from NiceOneFox/develop

Sprint 2

Author: NiceOneFox

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

README.md

@@ -1,15 +1,37 @@
-# ServiceSimulationSystem
+# Service Simulation System (Queueing System)
 
 Project aim is build service simulation system that has flow of requests which are created by sources. Requests is taken by devices on work, if they are no free devices requests go in buffer, also if new requests haven't come we take requests from buffer.
+Type of modeling system is "Special events method" (We move from one event to another simply increasing time).
+Special events are: 
+* arrive of new request, 
+* time of free device,
+* end of modeling.
 
+Results of moddeling represented by:
+* Modeling time
+* Amount of Generated requests
+* Amount of Served requests
+* Average probability of Maintenance ( P = N served / N total )
+* Bandwidth of System ( A = N served / T modeling )
+* Probability of Failure ( P failire of request = N declined / N total )
+
+Input parameters:
+* Number of Sources
+* Number of Devices
+* Buffer capacity
+* Amount of requests
+* Modeling time (max time)
+* SimulationType (Type of buffer modeling, FIFO, LIFO etc.)
+* Lambda (amount of flow) parameter for Poissonian flow
 
 ## Technologies
 - ASP .NET 6
 - C# 10
+- AutoMapper
 
 ## Architecture 
 N-Layer Web API
 
 ## Used Design Patterns
-1. Factory Pattern (Concrete implementation chosen by input parameter and provided by IoC)
+1. Factory Pattern (Concrete implementation is chosen by input parameter)
 2. Dependency Injection (DI)

backend/ServiceSimulation/WebApplication2/Api.csproj renamed to backend/ServiceSimulation/Api/Api.csproj

@@ -7,12 +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/Api/Configuration/ApiMapperConfigurator.cs

@@ -0,0 +1,37 @@
+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))
+            .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));
+    }
+}

backend/ServiceSimulation/Api/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/Api/Controllers/Simulation.cs

@@ -0,0 +1,40 @@
+using Api.Entities;
+using Api.enums;
+using AutoMapper;
+using Bll.Domain.Entities;
+using Bll.Domain.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Api.Controllers;
+
+[Route("simulation")]
+public class Simulation : Controller
+{
+    private readonly ISimulationService _simulationService;
+    private readonly ITimeProvider _time;
+    private readonly 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);
+        var endResultsOfModeling = _resultManager.CalculateResultsOfModeling();
+        var apiResults = _mapper.Map<ApiResults>((endResultsOfModeling, _results));
+
+        return Ok(apiResults);
+    }
+}

backend/ServiceSimulation/Api/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; }
+}

backend/ServiceSimulation/WebApplication2/Program.cs renamed to backend/ServiceSimulation/Api/Program.cs

@@ -1,3 +1,4 @@
+using Api.Configuration;
 using Bll.Domain.Entities;
 using Bll.Domain.Factories;
 using Bll.Domain.Interfaces;
@@ -14,17 +15,21 @@
 
 builder.Services.AddScoped<ITimeProvider, TimeProvider>();
 builder.Services.AddScoped<IResults, Bll.Domain.Entities.Results>();
+builder.Services.AddScoped<IResultManager, ResultManager>();
+builder.Services.AddScoped<IResultManager, ResultManager>();
 //builder.Services.AddTransient<IBufferManager, StandardBufferManager>();
 builder.Services.AddTransient<IBufferManagerFactory, BufferManagerFactory>();
 builder.Services.AddTransient<IDeviceManager, DeviceManager>();
 builder.Services.AddTransient<ISourceManager, SourceManager>();
+//builder.Services.AddScoped<StandardBufferManager>()
+//    .AddScoped<IBufferManager, StandardBufferManager>(s => s.GetRequiredService<StandardBufferManager>());
 
-
-builder.Services.AddScoped<StandardBufferManager>()
-    .AddScoped<IBufferManager, StandardBufferManager>(s => s.GetService<StandardBufferManager>());
-
+//builder.Services.AddScoped<IBufferManager>(s =>
+//    ActivatorUtilities.CreateInstance<StandardBufferManager>(s));
 #endregion
 
+builder.Services.AddMapper();
+
 var app = builder.Build();
 
 if (app.Environment.IsDevelopment())