chebser/RhSolutions-AddIn
0
0
Fork 0
Code Packages Releases 16 Wiki Activity

Revert "Move Price List Validation to separate static class"

Browse Source 
This reverts commit e14d714811.
This commit is contained in:
Serghei Cebotari 2023-10-17 21:22:42 +03:00
parent e462add7f3
commit 199540e530
12 changed files with 53 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,5 @@
using System.Net;
using ExcelDna.IntelliSense;
using Microsoft.Office.Interop.Excel;
#if !NET472
using System.Runtime.Versioning;
#endif

4
RhSolutions.AddIn/Controllers/RibbonController.cs
View File

@ -119,8 +119,8 @@ public class RibbonController : ExcelRibbon
else
{
WorksheetValidator.Validate(RhSolutionsAddIn.Excel.ActiveSheet);
_workbookIsValid = WorksheetValidator.IsValid();
Worksheet worksheet = RhSolutionsAddIn.Excel.ActiveWorkbook.ActiveSheet;
_workbookIsValid = worksheet.IsValidSource();
}
}
}

13
RhSolutions.AddIn/Services/ExcelReader.cs
View File

@ -85,7 +85,7 @@ public class ExcelReader : IReader, IDisposable
List<(string, Dictionary<Product, double>)> result = new();
foreach (Worksheet worksheet in worksheets)
{
if (!WorksheetValidator.IsValid())
if (!worksheet.IsValidSource())
{
continue;
}
@ -93,11 +93,12 @@ public class ExcelReader : IReader, IDisposable
string wbName = Path.GetFileNameWithoutExtension(
worksheet.Parent.Name);
Range amountCell = WorksheetValidator.HeaderCells["Amount"],
skuCell = WorksheetValidator.HeaderCells["Sku"],
productLineCell = WorksheetValidator.HeaderCells["ProductLine"],
nameCell = WorksheetValidator.HeaderCells["Name"],
measureCell = WorksheetValidator.HeaderCells["Measure"];
Range amountCell = worksheet.Cells.Find(headers["Amount"]);
Range headerRow = amountCell.EntireRow;
Range skuCell = headerRow.Find(headers["Sku"]),
productLineCell = headerRow.Find(headers["ProductLine"]),
nameCell = headerRow.Find(headers["Name"]),
measureCell = headerRow.Find(headers["Measure"]);
var lastRowIndex = worksheet.Cells[worksheet.Rows.Count, skuCell.Column]
.End[XlDirection.xlUp].Row;

12
RhSolutions.AddIn/Services/ExcelWriterBase.cs
View File

@ -31,7 +31,7 @@ namespace RhSolutions.Services
public void WriteProducts(IEnumerable<(string, Dictionary<Product, double>)> products)
{
if (!WorksheetValidator.IsValid())
if (!_worksheet.IsValidSource())
{
_application.ActiveWorkbook.Close();
throw new ArgumentException(
@ -40,11 +40,11 @@ namespace RhSolutions.Services
ShowFilteredData();
_amountCell = WorksheetValidator.HeaderCells["Amount"];
_skuCell = WorksheetValidator.HeaderCells["Sku"];
_programLineCell = WorksheetValidator.HeaderCells["ProductLine"];
_nameCell = WorksheetValidator.HeaderCells["Name"];
_oldSkuCell = WorksheetValidator.HeaderCells["OldSku"];
_amountCell = _worksheet.Cells.Find(_headers["Amount"]);
_skuCell = _worksheet.Cells.Find(_headers["Sku"]);
_programLineCell = _worksheet.Cells.Find(_headers["ProductLine"]);
_nameCell = _worksheet.Cells.Find(_headers["Name"]);
_oldSkuCell = _worksheet.Cells.Find(_headers["OldSku"]);
_progressBar = new("Заполняю строки...", products
.Select(p => p.Item2)

50
RhSolutions.AddIn/Services/WorksheetValidator.cs
View File

@ -1,50 +0,0 @@
#if !NET472
using System.Runtime.Versioning;
#endif
namespace RhSolutions.Services;
public static class WorksheetValidator
{
public static Dictionary<string, Range> HeaderCells { get; private set; }
public static void Validate(this Worksheet worksheet)
{
Range headerRow = null;
HeaderCells = new();
var headers = RhSolutionsAddIn.Configuration.GetPriceListHeaders();
foreach (var kvp in headers)
{
Range cell;
if (headerRow == null)
{
cell = worksheet.Cells.Find(kvp.Value);
if (cell == null)
{
continue;
}
headerRow = cell.EntireRow;
}
else
{
cell = headerRow.Cells.Find(kvp.Value);
}
if (HeaderCells.ContainsKey(kvp.Key))
{
HeaderCells[kvp.Key] = cell;
}
else
{
HeaderCells.Add(kvp.Key, cell);
}
}
}
public static bool IsValid()
{
return HeaderCells.Count >= RhSolutionsAddIn.Configuration.GetPriceListHeaders().Count - 1;
}
}

33
RhSolutions.AddIn/Tools/WorksheetExtensions.cs
View File

@ -9,6 +9,39 @@ namespace RhSolutions.Tools;
#endif
public static class WorksheetExtensions
{
private static readonly Dictionary<string, string> pricelistParameters =
RhSolutionsAddIn.Configuration.GetPriceListHeaders();
public static bool IsValidSource(this Worksheet worksheet)
{
Range headerRow;
string[] fields = pricelistParameters.Values
.Where(v => v != "Прежний материал")
.ToArray();
var value = worksheet.Cells.Find(fields[0]);
if (value == null)
{
return false;
}
else
{
headerRow = value.EntireRow;
}
for (int i = 1; i < fields.Length; i++)
{
if (headerRow.Find(fields[i]) == null)
{
return false;
}
}
return true;
}
public static void AddValue(this Range range, double value)
{
if (range.Value2 == null)

4
RhSolutions.Tests/CanDoGuess.cs
View File

@ -23,13 +23,11 @@ public class CanDoGuess : IDisposable
public void CanWriteMultiplyRows()
{
Worksheet sourceSheet = Util.Workbook.Worksheets[1];
sourceSheet.Validate();
RhSolutionsAddIn.Configuration.SetPriceListPath(Path.GetFullPath(@"..\..\..\TestWorkbooks\TargetSpecificationGuess.xlsx"));
var products = _guessReader.ReadProducts(new[] { sourceSheet });
var _writer = new NewPriceWriter(Util.Application, RhSolutionsAddIn.Configuration);
_writer.WriteProducts(products);
Worksheet targetSheet = Util.Application.ActiveWindow.ActiveSheet;
targetSheet.Validate();
var targetProducts = _reader.ReadProducts(new[] { targetSheet });
Assert.Equal("TestSpecificationGuess", products.First().Item1);
@ -42,13 +40,11 @@ public class CanDoGuess : IDisposable
public void CanWriteOneRow()
{
Worksheet sourceSheet = Util.Workbook.Worksheets[1];
sourceSheet.Validate();
RhSolutionsAddIn.Configuration.SetPriceListPath(Path.GetFullPath(@"..\..\..\TestWorkbooks\TargetSpecificationGuessOneRow.xlsx"));
var products = _guessReader.ReadProducts(new[] { sourceSheet });
var _writer = new NewPriceWriter(Util.Application, RhSolutionsAddIn.Configuration);
_writer.WriteProducts(products);
Worksheet targetSheet = Util.Application.ActiveWindow.ActiveSheet;
targetSheet.Validate();
var targetProducts = _reader.ReadProducts(new[] { targetSheet });
Assert.Equal("TestSpecificationGuessOneRow", products.First().Item1);

1
RhSolutions.Tests/CanFillSleeves.cs
View File

@ -24,7 +24,6 @@ public class CanFillSleeves : IDisposable
[ExcelFact(Workbook = @"..\..\..\TestWorkbooks\TestSpecificationSleeves.xlsx")]
public void CanCalculateSleeves()
{
_worksheet.Validate();
var products = _reader.ReadProducts(new[] { _worksheet });
var sleeves = _calculator.CalculateSleeves(products.First().Item2);
_writer.WriteProducts(sleeves);

2
RhSolutions.Tests/CanReadProducts.cs
View File

@ -22,7 +22,6 @@ public class CanReadProducts : IDisposable
public void CanReadRange()
{
Worksheet worksheet = _testWorkbook.Sheets[1];
worksheet.Validate();
worksheet.Range["A1"].Value = "11600011001";
worksheet.Range["A2"].Value = "11600011001";
worksheet.Range["A3"].Value = "160002-001";
@ -50,7 +49,6 @@ public class CanReadProducts : IDisposable
public void CanReadWorkbook()
{
Worksheet worksheet = Util.Workbook.Worksheets[1];
worksheet.Validate();
var result = _reader.ReadProducts(new[] { worksheet });
Assert.NotNull(result);
Assert.NotEmpty(result);

10
RhSolutions.Tests/CanWriteProducts.cs
View File

@ -21,13 +21,11 @@ public class CanWriteProducts : IDisposable
public void CanWriteSingle()
{
Worksheet sourceSheet = Util.Workbook.Worksheets[1];
sourceSheet.Validate();
RhSolutionsAddIn.Configuration.SetPriceListPath(Path.GetFullPath(@"..\..\..\TestWorkbooks\TargetSpecification.xlsx"));
var products = _reader.ReadProducts(new[] { sourceSheet });
var _writer = new NewPriceWriter(Util.Application, RhSolutionsAddIn.Configuration);
_writer.WriteProducts(products);
Worksheet targetSheet = Util.Application.ActiveWindow.ActiveSheet;
targetSheet.Validate();
var targetProducts = _reader.ReadProducts(new[] { targetSheet });
Assert.Equal("TestSpecification", products.First().Item1);
@ -40,13 +38,11 @@ public class CanWriteProducts : IDisposable
public void CanWriteMultipleProductLines()
{
Worksheet sourceSheet = Util.Workbook.Worksheets[1];
sourceSheet.Validate();
RhSolutionsAddIn.Configuration.SetPriceListPath(Path.GetFullPath(@"..\..\..\TestWorkbooks\TargetSpecificationMultipleProductLines.xlsx"));
var products = _reader.ReadProducts(new[] { sourceSheet });
var _writer = new NewPriceWriter(Util.Application, RhSolutionsAddIn.Configuration);
_writer.WriteProducts(products);
Worksheet targetSheet = Util.Application.ActiveWindow.ActiveSheet;
targetSheet.Validate();
var targetProducts = _reader.ReadProducts(new[] { targetSheet });
Assert.Equal("TestSpecificationMultipleProductLines", products.First().Item1);
@ -59,13 +55,11 @@ public class CanWriteProducts : IDisposable
public void CanWriteNotFound()
{
Worksheet sourceSheet = Util.Workbook.Worksheets[1];
sourceSheet.Validate();
RhSolutionsAddIn.Configuration.SetPriceListPath(Path.GetFullPath(@"..\..\..\TestWorkbooks\TargetSpecificationNotFound.xlsx"));
var products = _reader.ReadProducts(new[] { sourceSheet });
var _writer = new NewPriceWriter(Util.Application, RhSolutionsAddIn.Configuration);
_writer.WriteProducts(products);
Worksheet targetSheet = Util.Application.ActiveWindow.ActiveSheet;
targetSheet.Validate();
Assert.Equal("???", targetSheet.Range["B4"].Value2);
Assert.Contains("Молот Тора", targetSheet.Range["C4"].Value2);
@ -76,13 +70,11 @@ public class CanWriteProducts : IDisposable
public void CanWriteReplaced()
{
Worksheet sourceSheet = Util.Workbook.Worksheets[1];
sourceSheet.Validate();
RhSolutionsAddIn.Configuration.SetPriceListPath(Path.GetFullPath(@"..\..\..\TestWorkbooks\TargetSpecificationReplaced.xlsx"));
var products = _reader.ReadProducts(new[] { sourceSheet });
var _writer = new NewPriceWriter(Util.Application, RhSolutionsAddIn.Configuration);
_writer.WriteProducts(products);
Worksheet targetSheet = Util.Application.ActiveWindow.ActiveSheet;
targetSheet.Validate();
var targetProducts = _reader.ReadProducts(new[] { targetSheet });
Assert.Equal("TestSpecificationReplaced", products.First().Item1);
@ -100,13 +92,11 @@ public class CanWriteProducts : IDisposable
public void CanWriteNewVariant()
{
Worksheet sourceSheet = Util.Workbook.Worksheets[1];
sourceSheet.Validate();
RhSolutionsAddIn.Configuration.SetPriceListPath(Path.GetFullPath(@"..\..\..\TestWorkbooks\TargetSpecificationNewVariant.xlsx"));
var products = _reader.ReadProducts(new[] { sourceSheet });
var _writer = new NewPriceWriter(Util.Application, RhSolutionsAddIn.Configuration);
_writer.WriteProducts(products);
Worksheet targetSheet = Util.Application.ActiveWindow.ActiveSheet;
targetSheet.Validate();
var targetProducts = _reader.ReadProducts(new[] { targetSheet });
Assert.Equal("TestSpecificationNewVariant", products.First().Item1);

2
RhSolutions.Tests/RealPricelistTest.cs
View File

@ -21,13 +21,11 @@ public class RealPricelistTest : IDisposable
public void CanWrite()
{
Worksheet sourceSheet = Util.Workbook.Worksheets[1];
sourceSheet.Validate();
RhSolutionsAddIn.Configuration.SetPriceListPath(Path.GetFullPath(@"..\..\..\TestWorkbooks\RealTargetSpecification.xlsx"));
var products = _reader.ReadProducts(new[] { sourceSheet });
var _writer = new NewPriceWriter(Util.Application, RhSolutionsAddIn.Configuration);
_writer.WriteProducts(products);
Worksheet targetSheet = Util.Application.ActiveWindow.ActiveSheet;
targetSheet.Validate();
targetSheet.Range["A1"].Formula = "=SUM(H:H)";
Assert.Equal("RealTestSpecification", products.First().Item1);

11
RhSolutions.Tests/WorkbookValidationTests.cs
View File

@ -1,4 +1,5 @@
using RhSolutions.AddIn;
using RhSolutions.Tools;
namespace RhSolutions.Tests;
@ -17,17 +18,15 @@ public class WorkbookValidationTests : IDisposable
[ExcelFact(Workbook = @"..\..\..\TestWorkbooks\EmptyTestTable.xlsx")]
public void WorksheetIsCorrect()
{
Worksheet ws = Util.Workbook.Sheets[1];
ws.Validate();
Assert.True(WorksheetValidator.IsValid());
Worksheet worksheet = Util.Workbook.Sheets[1];
Assert.True(worksheet.IsValidSource());
}
[ExcelFact(Workbook = @"..\..\..\TestWorkbooks\EmptyWorkbook.xlsx")]
public void EmptyWorkbookIsNotCorrect()
{
Worksheet ws = Util.Workbook.Sheets[1];
ws.Validate();
Assert.False(WorksheetValidator.IsValid());
Worksheet worksheet = Util.Workbook.Sheets[1];
Assert.False(worksheet.IsValidSource());
}
public void Dispose()