Skip to content

refactor header row mapping logic to improve clarity and maintainability #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hurles merged 1 commit into from
Dec 8, 2025
Merged

refactor header row mapping logic to improve clarity and maintainability #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 30 additions & 27 deletions SharpExcel/Exporters/BaseSharpExcelSynchronizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using ClosedXML.Excel;
using Microsoft.Extensions.Options;
using SharpExcel.Abstraction;
using SharpExcel.Exporters.Helpers;
using SharpExcel.Extensions;
using SharpExcel.Models.Configuration;
using SharpExcel.Models.Data;
Expand Down Expand Up @@ -136,7 +137,7 @@ internal void ReadSheet(TargetingRule<TModel> rule, ExcelReadResult<TModel> resu
}

var headerRowIndex = FindAndMapHeaderRow(rule, instanceData, usedArea);
var remainingRows = usedArea.Rows(headerRowIndex, usedArea.RowCount()).ToList();
var remainingRows = usedArea.Rows(headerRowIndex + 1, usedArea.RowCount()).ToList();

//parse remaining data rows
foreach (var row in remainingRows)
Expand Down Expand Up @@ -228,34 +229,16 @@ private static int FindAndMapHeaderRow(
SharpExcelWriterInstanceData<TModel> instance,
IXLRange usedArea)
{
var headerNames = new HashSet<string>(instance.Properties.PropertyMappings.Where(
x => !string.IsNullOrWhiteSpace(x.NormalizedName))
.Select(x => x.NormalizedName?.ToLowerInvariant())!
);

IXLRow? headerRow;

if (rule.Row is not null && rule.Row > 0)
{
headerRow = usedArea.Row(rule.Row.Value).WorksheetRow();
}
else
{
headerRow = usedArea
.Rows(x => x.Cells()
.Any(c => headerNames.Contains(c.Value.ToString().ToLowerInvariant())))
.FirstOrDefault()?.WorksheetRow();
}

var headerRowId = headerRow!.RowNumber();
return MapHeaderRow(instance, usedArea, rule.Column ?? usedArea.FirstCell().WorksheetColumn().ColumnNumber(), rule.Row);
}

private static int MapHeaderRow(SharpExcelWriterInstanceData<TModel> instance, IXLRange usedArea, int startIndex, int? headerRowIndex = null)
{
var headerNames = GetHeaderNames(instance);
var propertiesByColumnName = instance.Properties.PropertyMappings.ToDictionary(x => x.NormalizedName);

var startIndex = usedArea.FirstCell().WorksheetColumn().ColumnNumber();
var headerRow = usedArea.Row(headerRowIndex is > 0 ? headerRowIndex.Value : 1).WorksheetRow();

if (rule.Column != null && rule.Column > startIndex)
startIndex = rule.Column ?? 1;

for (int i = startIndex; i <= usedArea.ColumnCount(); i++)
{
var cell = headerRow.Cell(i);
Expand All @@ -277,9 +260,29 @@ private static int FindAndMapHeaderRow(
}
}

return headerRowId <= 1 ? 2 : headerRowId - 1;
return headerRow.RowNumber();
}


private static IXLRow? FindHeaderRow(SharpExcelWriterInstanceData<TModel> instance, IXLRange usedArea)
{
IXLRow? headerRow;
var headerNames = GetHeaderNames(instance);

headerRow = usedArea
.Rows(x => x.Cells()
.Any(c => headerNames.Contains(c.Value.ToString().ToLowerInvariant())))
.FirstOrDefault()?.WorksheetRow();
return headerRow;
}

private static HashSet<string> GetHeaderNames(SharpExcelWriterInstanceData<TModel> instance)
{
return new HashSet<string>(instance.Properties.PropertyMappings.Where(
x => !string.IsNullOrWhiteSpace(x.NormalizedName))
.Select(x => x.NormalizedName?.ToLowerInvariant())!
);
}

private SharpExcelWriterInstanceData<TModel> CreateWriteInstanceData(CultureInfo cultureInfo, XLWorkbook workbook)
{
var random = new Random();
Expand Down