Compare commits

..

No commits in common. "408fa0f87ed15bf8ff6f866cb4f0bcafbad3d5f6" and "38e036553e0ef8f4dca259247019367c19f8df27" have entirely different histories.

8 changed files with 32 additions and 17 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,7 +1,7 @@
using AyCode.Interfaces.Entities; using AyCode.Interfaces.Entities;
using AyCode.Interfaces.TimeStampInfo; using AyCode.Interfaces.TimeStampInfo;
using DocumentFormat.OpenXml.Vml.Office;
using Mango.Nop.Core.Interfaces; using Mango.Nop.Core.Interfaces;
using Mango.Nop.Core.Loggers;
using Nop.Core; using Nop.Core;
using Nop.Core.Caching; using Nop.Core.Caching;
using Nop.Core.Configuration; using Nop.Core.Configuration;
@ -9,14 +9,15 @@ using Nop.Core.Domain.Catalog;
using Nop.Core.Domain.Common; using Nop.Core.Domain.Common;
using Nop.Core.Events; using Nop.Core.Events;
using Nop.Data; using Nop.Data;
using Nop.Services.Logging;
using System.Linq.Expressions; using System.Linq.Expressions;
namespace Mango.Nop.Core.Repositories; namespace Mango.Nop.Core.Repositories;
public abstract class MgDbTableBase<TEntity>(IEventPublisher eventPublisher, INopDataProvider dataProvider, IShortTermCacheManager shortTermCacheManager, IStaticCacheManager staticCacheManager, AppSettings appSettings) public abstract class MgDbTableBase<TEntity>(IEventPublisher eventPublisher, INopDataProvider dataProvider, IShortTermCacheManager shortTermCacheManager, IStaticCacheManager staticCacheManager, AppSettings appSettings, ILogger logger)
: EntityRepository<TEntity>(eventPublisher, dataProvider, shortTermCacheManager, staticCacheManager, appSettings), IMgDbTableBase where TEntity : BaseEntity : EntityRepository<TEntity>(eventPublisher, dataProvider, shortTermCacheManager, staticCacheManager, appSettings), IMgDbTableBase where TEntity : BaseEntity
{ {
//protected ILogger Logger = logger; protected ILogger Logger = logger;
protected IEventPublisher EventPublisher = eventPublisher; protected IEventPublisher EventPublisher = eventPublisher;
protected INopDataProvider DataProvider = dataProvider; protected INopDataProvider DataProvider = dataProvider;
protected IShortTermCacheManager ShortTermCacheManager = shortTermCacheManager; protected IShortTermCacheManager ShortTermCacheManager = shortTermCacheManager;
@ -29,7 +30,7 @@ public abstract class MgDbTableBase<TEntity>(IEventPublisher eventPublisher, INo
{ {
if (typeof(TEntity).GetInterface(nameof(ITimeStampCreated)) != null) if (typeof(TEntity).GetInterface(nameof(ITimeStampCreated)) != null)
{ {
(entity as ITimeStampCreated)!.Created = DateTime.UtcNow; ((entity as ITimeStampCreated)!).Created = DateTime.UtcNow;
} }
} }
@ -37,7 +38,7 @@ public abstract class MgDbTableBase<TEntity>(IEventPublisher eventPublisher, INo
{ {
if (typeof(TEntity).GetInterface(nameof(ITimeStampModified)) != null) if (typeof(TEntity).GetInterface(nameof(ITimeStampModified)) != null)
{ {
(entity as ITimeStampModified)!.Modified = DateTime.UtcNow; ((entity as ITimeStampModified)!).Modified = DateTime.UtcNow;
} }
} }

View File

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

View File

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