diff --git a/Mango.Nop.Core/Dtos/MgOrderDto.cs b/Mango.Nop.Core/Dtos/MgOrderDto.cs index 1ee5aeb..01e9909 100644 --- a/Mango.Nop.Core/Dtos/MgOrderDto.cs +++ b/Mango.Nop.Core/Dtos/MgOrderDto.cs @@ -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; diff --git a/Mango.Nop.Core/Loggers/Logger.cs b/Mango.Nop.Core/Loggers/Logger.cs index d492577..f894ded 100644 --- a/Mango.Nop.Core/Loggers/Logger.cs +++ b/Mango.Nop.Core/Loggers/Logger.cs @@ -5,8 +5,8 @@ namespace Mango.Nop.Core.Loggers; public class Logger : Logger, ILogger { - 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 : Logger, ILogger public class Logger : AcLoggerBase, ILogger { - public Logger() : this(null) - { - } + public Logger(params IAcLogWriterBase[] logWriters) : this(null, logWriters) + { } public Logger(string? categoryName) : base(categoryName) { } diff --git a/Mango.Nop.Core/Mango.Nop.Core.csproj b/Mango.Nop.Core/Mango.Nop.Core.csproj index 3cf25b6..035dc3a 100644 --- a/Mango.Nop.Core/Mango.Nop.Core.csproj +++ b/Mango.Nop.Core/Mango.Nop.Core.csproj @@ -8,7 +8,6 @@ - @@ -16,7 +15,6 @@ - diff --git a/Mango.Nop.Core/Repositories/MgDbContextBase.cs b/Mango.Nop.Core/Repositories/MgDbContextBase.cs index a6701f8..f5f7952 100644 --- a/Mango.Nop.Core/Repositories/MgDbContextBase.cs +++ b/Mango.Nop.Core/Repositories/MgDbContextBase.cs @@ -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 logWriters) + public MgDbContextBase(INopDataProvider dataProvider, IMgLockService lockService, ILogger logger) { LockService = lockService; - Logger = new Logger(logWriters.ToArray()); + Logger = logger;// new Logger(logWriters.ToArray()); DataProvider = dataProvider; } diff --git a/Mango.Nop.Core/Repositories/MgDbTableBase.cs b/Mango.Nop.Core/Repositories/MgDbTableBase.cs index e10020a..dea5a81 100644 --- a/Mango.Nop.Core/Repositories/MgDbTableBase.cs +++ b/Mango.Nop.Core/Repositories/MgDbTableBase.cs @@ -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(IEventPublisher eventPublisher, INopDataProvider dataProvider, IShortTermCacheManager shortTermCacheManager, IStaticCacheManager staticCacheManager, AppSettings appSettings, ILogger logger) +public abstract class MgDbTableBase(IEventPublisher eventPublisher, INopDataProvider dataProvider, IShortTermCacheManager shortTermCacheManager, IStaticCacheManager staticCacheManager, AppSettings appSettings) : EntityRepository(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; diff --git a/Mango.Nop.Core/Repositories/MgDtoDbTableBase.cs b/Mango.Nop.Core/Repositories/MgDtoDbTableBase.cs index 432e4d4..860e09d 100644 --- a/Mango.Nop.Core/Repositories/MgDtoDbTableBase.cs +++ b/Mango.Nop.Core/Repositories/MgDtoDbTableBase.cs @@ -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 : MgDbTableBase, IConsumer>, IConsumer>, - IConsumer> where TDtoEntity : BaseEntity/*, IMgModelDtoBase*/ where TMainEntity : BaseEntity +public abstract class MgDtoDbTableBase : MgDbTableBase where TDtoEntity : BaseEntity/*, IMgModelDtoBase*/ 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) { } diff --git a/Mango.Nop.Services/Class1.cs b/Mango.Nop.Services/Class1.cs deleted file mode 100644 index 4c0c7f4..0000000 --- a/Mango.Nop.Services/Class1.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Mango.Nop.Services -{ - public class Class1 - { - - } -} diff --git a/Mango.Nop.Core/Loggers/NopLogWriter.cs b/Mango.Nop.Services/Loggers/NopLogWriter.cs similarity index 99% rename from Mango.Nop.Core/Loggers/NopLogWriter.cs rename to Mango.Nop.Services/Loggers/NopLogWriter.cs index 28753fc..f989eb9 100644 --- a/Mango.Nop.Core/Loggers/NopLogWriter.cs +++ b/Mango.Nop.Services/Loggers/NopLogWriter.cs @@ -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 {