Refactor worksheet selection to prioritize active tab in Excel parsers

2 files changed, 2 insertions, 2 deletions

diff --git a/RhSolutions.SkuParser.Api/Services/BsExcelParser.cs b/RhSolutions.SkuParser.Api/Services/BsExcelParser.cs
index df8fafd..801e28f 100644
--- a/RhSolutions.SkuParser.Api/Services/BsExcelParser.cs
+++ b/RhSolutions.SkuParser.Api/Services/BsExcelParser.cs
@@ -18,7 +18,7 @@ public class BsExcelParser : ISkuParser
 	public Dictionary<Product, double> ParseProducts(IFormFile file)
 	{
 		using XLWorkbook workbook = new(file.OpenReadStream());
-		IXLWorksheet ws = workbook.Worksheet(1);
+		IXLWorksheet ws = workbook.Worksheets.FirstOrDefault(ws => ws.TabActive) ?? workbook.Worksheet(1);
 		var headers = configuration.GetSection("Headers");
 		ws.AutoFilter.Clear();
 		var cells = configuration.GetSection("Headers")
diff --git a/RhSolutions.SkuParser.Api/Services/CommonExcelParser.cs b/RhSolutions.SkuParser.Api/Services/CommonExcelParser.cs
index 206200d..eb4e1bb 100644
--- a/RhSolutions.SkuParser.Api/Services/CommonExcelParser.cs
+++ b/RhSolutions.SkuParser.Api/Services/CommonExcelParser.cs
@@ -9,7 +9,7 @@ public class CommonExcelParser : ISkuParser
 	public Dictionary<Product, double> ParseProducts(IFormFile file)

 	{

 		using XLWorkbook workbook = new(file.OpenReadStream());

-		IXLWorksheet ws = workbook.Worksheet(1);

+		IXLWorksheet ws = workbook.Worksheets.FirstOrDefault(ws => ws.TabActive) ?? workbook.Worksheet(1);

 

 		var leftTop = ws.FirstCellUsed()?.Address;

 		var rightBottom = ws.LastCellUsed()?.Address;