chebser/RhSolutions-AddIn
0
0
Fork 0
Code Packages Releases 14 Activity

Add Couplings calculator

Browse Source
This commit is contained in:
Serghei Cebotari 2023-11-02 23:07:06 +03:00
parent d999a0b98a
commit 8a8fc397bf
8 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs
View File

@ -25,7 +25,7 @@ public sealed class RhSolutionsAddIn : IExcelAddIn
.AddSingleton<IAddInConfiguration, AddInConfiguration>() .AddSingleton<IAddInConfiguration, AddInConfiguration>()
.AddSingleton<IDatabaseClient, DatabaseClient>() .AddSingleton<IDatabaseClient, DatabaseClient>()
.AddSingleton<ICurrencyClient, CurrencyClient>() .AddSingleton<ICurrencyClient, CurrencyClient>()
.AddSingleton<ISleevesCalculator, SleevesCalculator>() .AddSingleton<IFittingsCalculator, SleevesCalculator>()
.AddTransient<IFileDialog, FileDialog>(); .AddTransient<IFileDialog, FileDialog>();
Services.AddSingleton<WriterFactory>(); Services.AddSingleton<WriterFactory>();

9
RhSolutions.AddIn/Services/CouplingsCalculator.cs Normal file
View File

@ -0,0 +1,9 @@
namespace RhSolutions.Services;
public class CouplingsCalculator : IFittingsCalculator
{
public Dictionary<Product, double> Calculate(Dictionary<Product, double> products)
{
throw new NotImplementedException();
}
}

6
RhSolutions.AddIn/Services/IFittingsCalculator.cs Normal file
View File

@ -0,0 +1,6 @@
namespace RhSolutions.Services;
public interface IFittingsCalculator
{
public Dictionary<Product, double> Calculate(Dictionary<Product, double> products);
}

6
RhSolutions.AddIn/Services/ISleevesCalculator.cs
View File

@ -1,6 +0,0 @@
namespace RhSolutions.Services;
public interface ISleevesCalculator
{
public Dictionary<Product, double> CalculateSleeves(Dictionary<Product, double> products);
}

4
RhSolutions.AddIn/Services/SleevesCalculator.cs
View File

@ -2,14 +2,14 @@
namespace RhSolutions.Services; namespace RhSolutions.Services;
public class SleevesCalculator : ISleevesCalculator public class SleevesCalculator : IFittingsCalculator
{ {
private const string doublePattern = private const string doublePattern =
@"((?i)равнопроходная|угольник\s+90|угольник\s+45|Т-образная|Комплект\s+трубок(?i))(.+?\b(?<Sleeve>16|20|25|32|40|50|63)\b)+"; @"((?i)равнопроходная|угольник\s+90|угольник\s+45|Т-образная|Комплект\s+трубок(?i))(.+?\b(?<Sleeve>16|20|25|32|40|50|63)\b)+";
private const string singlePattern = private const string singlePattern =
@"((?i)муфта|тройник|переходник|угольник|штуцер|Г-образная|заглушка(?i))(.+?\b(?<Sleeve>16|20|25|32|40|50|63)\b)+"; @"((?i)муфта|тройник|переходник|угольник|штуцер|Г-образная|заглушка(?i))(.+?\b(?<Sleeve>16|20|25|32|40|50|63)\b)+";
public Dictionary<Product, double> CalculateSleeves(Dictionary<Product, double> products) public Dictionary<Product, double> Calculate(Dictionary<Product, double> products)
{ {
Dictionary<string, double> result = new() Dictionary<string, double> result = new()
{ {

6
RhSolutions.AddIn/Tools/SleevesTool.cs
View File

@ -2,9 +2,9 @@
internal class SleevesTool : Tool internal class SleevesTool : Tool
{ {
private readonly ISleevesCalculator _sleevesCaluculator; private readonly IFittingsCalculator _sleevesCaluculator;
public SleevesTool(ReaderFactory readerFactory, WriterFactory writerFactory, ISleevesCalculator sleevesCaluculator) : base(readerFactory, writerFactory) public SleevesTool(ReaderFactory readerFactory, WriterFactory writerFactory, IFittingsCalculator sleevesCaluculator) : base(readerFactory, writerFactory)
{ {
_sleevesCaluculator = sleevesCaluculator; _sleevesCaluculator = sleevesCaluculator;
} }
@ -15,7 +15,7 @@ internal class SleevesTool : Tool
Worksheet worksheet = app.ActiveWorkbook.ActiveSheet; Worksheet worksheet = app.ActiveWorkbook.ActiveSheet;
_reader = _readerFactory.GetReader("Excel"); _reader = _readerFactory.GetReader("Excel");
var products = _reader.ReadProducts(new[] { worksheet }); var products = _reader.ReadProducts(new[] { worksheet });
var sleeves = _sleevesCaluculator.CalculateSleeves(products.Select(p => p.Item2).First()); var sleeves = _sleevesCaluculator.Calculate(products.Select(p => p.Item2).First());
_writer = _writerFactory.GetWriter("CurrentPrice"); _writer = _writerFactory.GetWriter("CurrentPrice");
_writer.WriteProducts(sleeves); _writer.WriteProducts(sleeves);
} }

2
RhSolutions.AddIn/Tools/ToolFactory.cs
View File

@ -4,7 +4,7 @@ internal class ToolFactory
{ {
static ReaderFactory readerFactory = RhSolutionsAddIn.ServiceProvider.GetService<ReaderFactory>(); static ReaderFactory readerFactory = RhSolutionsAddIn.ServiceProvider.GetService<ReaderFactory>();
static WriterFactory writerFactory = RhSolutionsAddIn.ServiceProvider.GetService<WriterFactory>(); static WriterFactory writerFactory = RhSolutionsAddIn.ServiceProvider.GetService<WriterFactory>();
static ISleevesCalculator sleevesCaluculator = RhSolutionsAddIn.ServiceProvider.GetService<ISleevesCalculator>(); static IFittingsCalculator sleevesCaluculator = RhSolutionsAddIn.ServiceProvider.GetService<IFittingsCalculator>();
public Tool GetTool(string toolName) public Tool GetTool(string toolName)
{ {

4
RhSolutions.Tests/CanFillSleeves.cs
View File

@ -6,7 +6,7 @@ namespace RhSolutions.Tests;
public class CanFillSleeves : IDisposable public class CanFillSleeves : IDisposable
{ {
private RhSolutionsAddIn _addIn; private RhSolutionsAddIn _addIn;
private ISleevesCalculator _calculator; private IFittingsCalculator _calculator;
private IReader _reader; private IReader _reader;
private IWriter _writer; private IWriter _writer;
private Worksheet _worksheet; private Worksheet _worksheet;
@ -25,7 +25,7 @@ public class CanFillSleeves : IDisposable
public void CanCalculateSleeves() public void CanCalculateSleeves()
{ {
var products = _reader.ReadProducts(new[] { _worksheet }); var products = _reader.ReadProducts(new[] { _worksheet });
var sleeves = _calculator.CalculateSleeves(products.First().Item2); var sleeves = _calculator.Calculate(products.First().Item2);
_writer.WriteProducts(sleeves); _writer.WriteProducts(sleeves);
Assert.Equal(25, _worksheet.Range["E2"].Value); Assert.Equal(25, _worksheet.Range["E2"].Value);