Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Remove unused class
support1ee54a83d42c
diff --git a/src/Business/Grand.Business.Common/Services/ExportImport/ExcelImportProvider.cs b/src/Business/Grand.Business.Common/Services/ExportImport/ExcelImportProvider.csindex 952989892..b16a2028d 100644--- a/src/Business/Grand.Business.Common/Services/ExportImport/ExcelImportProvider.cs+++ b/src/Business/Grand.Business.Common/Services/ExportImport/ExcelImportProvider.cs@@ -1,4 +1,4 @@-using Grand.Business.Common.Utilities;+using Ganss.Excel;using Grand.Business.Core.Interfaces.ExportImport;namespace Grand.Business.Common.Services.ExportImport@@ -7,7 +7,7 @@ namespace Grand.Business.Common.Services.ExportImport{public async Task<IEnumerable<T>> Convert<T>(Stream stream){- var excel = new PowerExcelMapper {+ var excel = new ExcelMapper {SkipBlankCells = false};return await excel.FetchAsync<T>(stream);diff --git a/src/Business/Grand.Business.Common/Utilities/PowerColumnInfo.cs b/src/Business/Grand.Business.Common/Utilities/PowerColumnInfo.csdeleted file mode 100644index 6b8d96845..000000000--- a/src/Business/Grand.Business.Common/Utilities/PowerColumnInfo.cs+++ /dev/null@@ -1,48 +0,0 @@-using Ganss.Excel;-using NPOI.SS.UserModel;-using System;-using System.Collections.Generic;-using System.Globalization;-using System.Linq;-using System.Text;-using System.Threading.Tasks;--namespace Grand.Business.Common.Utilities-{- public class PowerColumnInfo : ColumnInfo- {- /// <summary>- /// Computes value that can be assigned to property from cell value.- /// </summary>- /// <param name="o">The object which contains the property.</param>- /// <param name="val">The value.</param>- /// <param name="cell">The cell where the value originates from.</param>- /// <returns>Value that can be assigned to property.</returns>- public override object GetPropertyValue(object o, object val, ICell cell)- {- object v;- if (SetProp != null)- v = SetProp(o, val, cell);- else if (IsNullable && (val == null || val is string s && s.Length == 0) && PropertyType == typeof(string)) //CHANGES FOR GRANDNODE- v = ""; //CHANGES FOR GRANDNODE- else if (IsNullable && (val == null || val is string z && z.Length == 0))- v = null;- else if (val is string g && PropertyType == typeof(Guid))- v = Guid.Parse(g);- else if (val is string es && PropertyType.IsEnum)- v = ParseEnum(PropertyType, es);- else if (val is string && PropertyType == typeof(byte[]))- v = Encoding.UTF8.GetBytes(val as string);- else- v = Convert.ChangeType(val, PropertyType, CultureInfo.InvariantCulture);-- return v;- }-- private object ParseEnum(Type t, string s)- {- var name = Enum.GetNames(t).FirstOrDefault(n => n.Equals(s, StringComparison.OrdinalIgnoreCase));- return name == null ? Activator.CreateInstance(t) : Enum.Parse(t, name);- }- }-}diff --git a/src/Business/Grand.Business.Common/Utilities/PowerExcelExtensions.cs b/src/Business/Grand.Business.Common/Utilities/PowerExcelExtensions.csdeleted file mode 100644index c3006765a..000000000--- a/src/Business/Grand.Business.Common/Utilities/PowerExcelExtensions.cs+++ /dev/null@@ -1,35 +0,0 @@-using NPOI.SS.UserModel;-using System.Reflection;--namespace Grand.Business.Common.Utilities-{- static class PowerExcelExtensions- {- internal static IEnumerable<IRow> Rows(this ISheet sheet)- {- var e = sheet.GetRowEnumerator();- while (e.MoveNext())- yield return e.Current as IRow;- }-- internal static bool IsIdenticalTo(this MemberInfo memberInfo, MemberInfo other)- {- if (memberInfo == null || other == null) return false;- return memberInfo.Equals(other) || memberInfo.MetadataToken == other.MetadataToken;- }-- /// <summary>- /// convert to Nullable type- /// </summary>- /// <param name="type"></param>- /// <returns></returns>- internal static Type ConvertToNullableType(this Type type)- {- if (type.IsPrimitive || type.IsValueType)- {- return typeof(Nullable<>).MakeGenericType(type);- }- return type;- }- }-}diff --git a/src/Business/Grand.Business.Common/Utilities/PowerExcelMapper.cs b/src/Business/Grand.Business.Common/Utilities/PowerExcelMapper.csdeleted file mode 100644index a1716da2a..000000000--- a/src/Business/Grand.Business.Common/Utilities/PowerExcelMapper.cs+++ /dev/null@@ -1,319 +0,0 @@-using Ganss.Excel;-using Ganss.Excel.Exceptions;-using NPOI.SS.UserModel;-using System;-using System.Collections;-using System.Collections.Generic;-using System.Linq;-using System.Reflection;-using System.Text;-using System.Text.Json;-using System.Threading.Tasks;--namespace Grand.Business.Common.Utilities-{- public class PowerExcelMapper : ExcelMapper- {-- Dictionary<string, Dictionary<int, object>> Objects { get; set; } = new();-- static async Task<Stream> ReadAsync(Stream stream)- {- var ms = new MemoryStream();- await stream.CopyToAsync(ms);- return ms;- }-- /// <summary>- /// Fetches objects from the specified sheet index using async I/O.- /// </summary>- /// <typeparam name="T">The type of objects the Excel file is mapped to.</typeparam>- /// <param name="stream">The stream the Excel file is read from.</param>- /// <param name="sheetIndex">Index of the sheet.</param>- /// <param name="valueParser">Allow value parsing</param>- /// <returns>The objects read from the Excel file.</returns>- public new async Task<IEnumerable<T>> FetchAsync<T>(Stream stream, int sheetIndex = 0, Func<string, object, object> valueParser = null)- {- using var ms = await ReadAsync(stream);- return Fetch(ms, typeof(T), sheetIndex, valueParser).OfType<T>();- }-- IEnumerable Fetch(ISheet sheet, Type type, Func<string, object, object> valueParser = null)- {- var firstRowNumber = HeaderRowNumber;-- if (!HeaderRow)- firstRowNumber = sheet.Rows().Where(r => r.RowNum >= MinRowNumber && r.RowNum <= MaxRowNumber)- .OrderByDescending(r => r.LastCellNum).FirstOrDefault()?.RowNum ?? 0;-- var firstRow = sheet.GetRow(firstRowNumber);-- if (firstRow == null)- yield break;-- var cells = Enumerable.Range(0, firstRow.LastCellNum).Select(i => firstRow.GetCell(i, MissingCellPolicy.RETURN_BLANK_AS_NULL));- var firstRowCells = cells- .Where(c => !HeaderRow || !string.IsNullOrWhiteSpace(c.ToString()));- var typeMapper = type != null ? TypeMapperFactory.Create(type) : TypeMapper.Create(firstRowCells, HeaderRow);-- if (TrackObjects) Objects[sheet.SheetName] = new Dictionary<int, object>();-- var objInstanceIdx = 0;-- foreach (IRow row in sheet)- {- var i = row.RowNum;-- if (i < MinRowNumber) continue;- if (i > MaxRowNumber) break;-- // optionally skip header row and blank rows- if ((!HeaderRow || i != HeaderRowNumber) && (!SkipBlankRows || row.Cells.Any(c => !IsCellBlank(c))))- {- var o = MapCells(type, valueParser, typeMapper, firstRowCells, ref objInstanceIdx, row, new HashSet<Type> { type });- yield return o;- }- }- }- private static bool IsCellBlank(ICell cell)- {- return cell.CellType switch {- CellType.String => string.IsNullOrWhiteSpace(cell.StringCellValue),- CellType.Blank => true,- _ => false,- };- }-- private object MapCells(Type type, Func<string, object, object> valueParser, TypeMapper typeMapper,- IEnumerable<ICell> cells, ref int objInstanceIdx, IRow row, ISet<Type> callChain)- {- var sheet = row.Sheet;- var i = row.RowNum;- List<(PowerColumnInfo Col, object CellValue, ICell Cell, int ColumnIndex)> initValues = new();- var columns = cells- .Select(c => (Index: c.ColumnIndex,- Columns: GetColumnInfo(typeMapper, c).Where(c => c.Directions.HasFlag(MappingDirections.ExcelToObject) && !c.IsSubType).ToList()))- .Where(c => c.Columns.Any())- .ToList();-- foreach (var (columnIndex, columnInfos) in columns)- {- var cell = row.GetCell(columnIndex, MissingCellPolicy.CREATE_NULL_AS_BLANK);-- if (cell != null && (!SkipBlankCells || !IsCellBlank(cell)))- {- foreach (PowerColumnInfo ci in columnInfos)- {- object cellValue;-- try- {- cellValue = GetCellValue(cell, ci);- }- catch (Exception e)- {- cellValue = GetCellValue(cell);- TriggerOrThrowParsingError(new ExcelMapperConvertException(cellValue, ci.PropertyType, i, columnIndex, e));- }-- try- {- if (valueParser != null)- cellValue = valueParser(string.IsNullOrWhiteSpace(ci.Name) ? columnIndex.ToString() : ci.Name, cellValue);-- initValues.Add((ci, cellValue, cell, columnIndex));- }- catch (Exception e)- {- TriggerOrThrowParsingError(new ExcelMapperConvertException(cellValue, ci.PropertyType, i, columnIndex, e));- }- }- }- }-- if (!IgnoreNestedTypes)- {- foreach (PowerColumnInfo ci in typeMapper.ColumnsByName.SelectMany(c => c.Value).Where(c => c.IsSubType))- {- if (!callChain.Contains(ci.PropertyType) // check for cycle in type hierarchy- && !initValues.Any(v => v.Col.Property.IsIdenticalTo(ci.Property))) // map subtypes only if not already mapped- {- callChain.Add(ci.PropertyType);- var subTypeMapper = TypeMapperFactory.Create(ci.PropertyType);- var subObject = MapCells(ci.PropertyType, valueParser, subTypeMapper, cells, ref objInstanceIdx, row, callChain);- initValues.Add((ci, subObject, null, -1));- }- }- }-- object o;-- if (type == null)- o = typeMapper.CreateExpando();- else- {- if (typeMapper.Constructor != null)- {- var parms = typeMapper.Constructor.GetParameters();- var vals = parms.Select(p => GetDefault(p.ParameterType)).ToArray();-- foreach (var initVal in initValues.ToList())- {- if (typeMapper.ConstructorParams.TryGetValue(initVal.Col.Property.Name, out var parm))- {- try- {- object v;-- if (initVal.Cell != null)- v = initVal.Col.GetPropertyValue(null, initVal.CellValue, initVal.Cell);- else- v = initVal.CellValue;-- vals[parm.Position] = v;-- initValues.Remove(initVal);- }- catch (Exception ex)- {- TriggerOrThrowParsingError(new ExcelMapperConvertException(initVal.CellValue, initVal.Col.PropertyType, i, initVal.ColumnIndex, ex));- }- }- }-- try- {- o = typeMapper.Constructor.Invoke(vals);- }- catch (Exception ex)- {- throw new ExcelMapperConvertException($"Failed to initialize type {type.FullName}.", ex);- }- }- else- {- if (ObjectFactories.TryGetValue(type, out var factory))- {- o = factory();- }- else- {- try- {- o = Activator.CreateInstance(type);- }- catch (Exception)- {- o = null;- }- }-- if (o == null)- return null;- }- }-- if (initValues.Any())- {- foreach (var val in initValues)- {- try- {- if (val.Cell != null)- val.Col.SetProperty(o, val.CellValue, val.Cell);- else- val.Col.Property.SetValue(o, val.CellValue);- }- catch (Exception ex)- {- TriggerOrThrowParsingError(new ExcelMapperConvertException(val.CellValue, val.Col.PropertyType, i, val.ColumnIndex, ex));- }- }- }- if (TrackObjects) Objects[sheet.SheetName][i] = o;-- objInstanceIdx++;- return o;- }-- static object GetDefault(Type t) => t.GetTypeInfo().IsValueType ? Activator.CreateInstance(t) : null;-- readonly Dictionary<Type, Func<object>> ObjectFactories = new();-- private void TriggerOrThrowParsingError(ExcelMapperConvertException excelMapperConvertException)- {- var parsingError = new ParsingErrorEventArgs(excelMapperConvertException);- //ErrorParsingCell?.Invoke(this, parsingError);- if (!parsingError.Cancel)- throw excelMapperConvertException;- }-- private Func<string, string> NormalizeName { get; set; }- List<ColumnInfo> GetColumnInfo(TypeMapper typeMapper, ICell cell)- {- var colByIndex = typeMapper.GetColumnByIndex(cell.ColumnIndex);-- if (!HeaderRow || colByIndex != null)- return colByIndex ?? new();-- var name = cell.ToString();- var colByName = typeMapper.GetColumnByName(name);-- // map column by name only if it hasn't been mapped to another property by index- if (colByName != null- && !typeMapper.ColumnsByIndex.SelectMany(ci => ci.Value).Any(c => c.Property.Name.Equals(name, StringComparison.OrdinalIgnoreCase)))- return colByName;-- return new();- }-- object GetCellValue(ICell cell, ColumnInfo targetColumn)- {- var formulaResult = cell.CellType == CellType.Formula && (targetColumn.PropertyType != typeof(string) || targetColumn.FormulaResult);- var cellType = formulaResult ? cell.CachedFormulaResultType : cell.CellType;- const int maxDate = 2958465; // 31/12/9999-- switch (cellType)- {- case CellType.Numeric:- if (!formulaResult && targetColumn.PropertyType == typeof(string))- {- return DataFormatter.FormatCellValue(cell);- }- else if (cell.NumericCellValue < maxDate && DateUtil.IsCellDateFormatted(cell))- {- return cell.DateCellValue;- }- else- return cell.NumericCellValue;- case CellType.Formula:- return cell.CellFormula;- case CellType.Boolean:- return cell.BooleanCellValue;- case CellType.Error:- return cell.ErrorCellValue;- case CellType.Unknown:- case CellType.Blank:- case CellType.String:- default:- if (targetColumn.Json)- return JsonSerializer.Deserialize(cell.StringCellValue, targetColumn.PropertyType);- else- return cell.StringCellValue;- }- }-- object GetCellValue(ICell cell)- {- return cell.CellType switch {- CellType.Numeric => cell.NumericCellValue,- CellType.Formula => cell.CellFormula,- CellType.Boolean => cell.BooleanCellValue,- CellType.Error => cell.ErrorCellValue,- CellType.String => cell.StringCellValue,- CellType.Blank => string.Empty,- _ => "<unknown>",- };- }- }-}