Adam
/
Mango.Nop.Libraries
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactoring, cleanup, etc...

This commit is contained in:
Loretta 2025-10-22 15:16:20 +02:00
parent 38e036553e
commit d52deeb2b4
8 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mango.Nop.Core/Dtos/MgOrderDto.cs
View File

@ -1,7 +1,5 @@
using AutoMapper;
using AyCode.Core.Extensions;
using DocumentFormat.OpenXml.Bibliography;
using DocumentFormat.OpenXml.Wordprocessing;
using LinqToDB.Mapping;
using Mango.Nop.Core.Entities;
using Mango.Nop.Core.Interfaces;

9
Mango.Nop.Core/Loggers/Logger.cs
View File

@ -5,8 +5,8 @@ namespace Mango.Nop.Core.Loggers;
public class Logger<TCategory> : Logger, ILogger<TCategory>
{
public Logger() : base(typeof(TCategory).Name)
{ }
//public Logger() : base(typeof(TCategory).Name)
//{ }
public Logger(params IAcLogWriterBase[] logWriters) : base(typeof(TCategory).Name, logWriters)
{ }
@ -17,9 +17,8 @@ public class Logger<TCategory> : Logger, ILogger<TCategory>
public class Logger : AcLoggerBase, ILogger
{
public Logger() : this(null)
{
}
public Logger(params IAcLogWriterBase[] logWriters) : this(null, logWriters)
{ }
public Logger(string? categoryName) : base(categoryName)
{ }

2
Mango.Nop.Core/Mango.Nop.Core.csproj
View File

@ -8,7 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AutoMapper" Version="13.0.1" />
<PackageReference Include="MessagePack.Annotations" Version="3.1.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.10" />
</ItemGroup>
@ -16,7 +15,6 @@
<ItemGroup>
<ProjectReference Include="..\..\..\..\FruitBank\Libraries\Nop.Core\Nop.Core.csproj" />
<ProjectReference Include="..\..\..\..\FruitBank\Libraries\Nop.Data\Nop.Data.csproj" />
<ProjectReference Include="..\..\..\..\FruitBank\Libraries\Nop.Services\Nop.Services.csproj" />
</ItemGroup>
<ItemGroup>

6
Mango.Nop.Core/Repositories/MgDbContextBase.cs
View File

@ -12,7 +12,7 @@ using Nop.Data;
namespace Mango.Nop.Core.Repositories;
public class MgDbContextBase : IMgDbContextBase
public abstract class MgDbContextBase : IMgDbContextBase
{
//TODO: ez itt nem ay igazi, kitalálni vmit! - J.
private readonly CacheKey _auctionAllKey = new("Nop.auction.all-{0}", AUCTION_PATTERN_KEY);
@ -25,11 +25,11 @@ public class MgDbContextBase : IMgDbContextBase
//public IHttpContextAccessor HttpContextAccessor { get; init; }
public MgDbContextBase(INopDataProvider dataProvider, IMgLockService lockService, IEnumerable<IAcLogWriterBase> logWriters)
public MgDbContextBase(INopDataProvider dataProvider, IMgLockService lockService, ILogger logger)
{
LockService = lockService;
Logger = new Logger<MgDbContextBase>(logWriters.ToArray());
Logger = logger;// new Logger<MgDbContextBase>(logWriters.ToArray());
DataProvider = dataProvider;
}

7
Mango.Nop.Core/Repositories/MgDbTableBase.cs
View File

@ -1,7 +1,7 @@
using AyCode.Interfaces.Entities;
using AyCode.Interfaces.TimeStampInfo;
using DocumentFormat.OpenXml.Vml.Office;
using Mango.Nop.Core.Interfaces;
using Mango.Nop.Core.Loggers;
using Nop.Core;
using Nop.Core.Caching;
using Nop.Core.Configuration;
@ -9,15 +9,14 @@ using Nop.Core.Domain.Catalog;
using Nop.Core.Domain.Common;
using Nop.Core.Events;
using Nop.Data;
using Nop.Services.Logging;
using System.Linq.Expressions;
namespace Mango.Nop.Core.Repositories;
public abstract class MgDbTableBase<TEntity>(IEventPublisher eventPublisher, INopDataProvider dataProvider, IShortTermCacheManager shortTermCacheManager, IStaticCacheManager staticCacheManager, AppSettings appSettings, ILogger logger)
public abstract class MgDbTableBase<TEntity>(IEventPublisher eventPublisher, INopDataProvider dataProvider, IShortTermCacheManager shortTermCacheManager, IStaticCacheManager staticCacheManager, AppSettings appSettings)
: EntityRepository<TEntity>(eventPublisher, dataProvider, shortTermCacheManager, staticCacheManager, appSettings), IMgDbTableBase where TEntity : BaseEntity
{
protected ILogger Logger = logger;
//protected ILogger Logger = logger;
protected IEventPublisher EventPublisher = eventPublisher;
protected INopDataProvider DataProvider = dataProvider;
protected IShortTermCacheManager ShortTermCacheManager = shortTermCacheManager;

10
Mango.Nop.Core/Repositories/MgDtoDbTableBase.cs
View File

@ -1,23 +1,21 @@
using System.Linq.Expressions;
using LinqToDB;
using Mango.Nop.Core.Loggers;
using Nop.Core;
using Nop.Core.Caching;
using Nop.Core.Configuration;
using Nop.Core.Domain.Orders;
using Nop.Core.Events;
using Nop.Data;
using Nop.Services.Events;
using Nop.Services.Logging;
namespace Mango.Nop.Core.Repositories;
public abstract class MgDtoDbTableBase<TDtoEntity, TMainEntity> : MgDbTableBase<TDtoEntity>, IConsumer<EntityInsertedEvent<TDtoEntity>>, IConsumer<EntityUpdatedEvent<TDtoEntity>>,
IConsumer<EntityDeletedEvent<TDtoEntity>> where TDtoEntity : BaseEntity/*, IMgModelDtoBase<TDtoEntity>*/ where TMainEntity : BaseEntity
public abstract class MgDtoDbTableBase<TDtoEntity, TMainEntity> : MgDbTableBase<TDtoEntity> where TDtoEntity : BaseEntity/*, IMgModelDtoBase<TDtoEntity>*/ where TMainEntity : BaseEntity
{
public Type MainEntityType { get; } = typeof(Order);
public MgDtoDbTableBase(IEventPublisher eventPublisher, INopDataProvider dataProvider, IShortTermCacheManager shortTermCacheManager, IStaticCacheManager staticCacheManager, AppSettings appSettings, ILogger logger)
: base(eventPublisher, dataProvider, shortTermCacheManager, staticCacheManager, appSettings, logger)
public MgDtoDbTableBase(IEventPublisher eventPublisher, INopDataProvider dataProvider, IShortTermCacheManager shortTermCacheManager, IStaticCacheManager staticCacheManager, AppSettings appSettings)
: base(eventPublisher, dataProvider, shortTermCacheManager, staticCacheManager, appSettings)
{
}

7
Mango.Nop.Services/Class1.cs
View File

@ -1,7 +0,0 @@
namespace Mango.Nop.Services
{
public class Class1
{
}
}

2
Mango.Nop.Core/Loggers/NopLogWriter.cs → Mango.Nop.Services/Loggers/NopLogWriter.cs
View File

@ -18,7 +18,7 @@ using System.Transactions;
using LogLevel = AyCode.Core.Loggers.LogLevel;
using LogLevelNop = Nop.Core.Domain.Logging.LogLevel;
namespace Mango.Nop.Core.Loggers
namespace Mango.Nop.Services.Loggers
{
public interface INopLoggerMsSqlNopDataProvider
{