IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #592 from ONLYOFFICE/bugfix/refactoring-fix

Browse Source 
Bugfix/refactoring fix
This commit is contained in:
Alexey Bannov 2022-03-21 17:54:54 +04:00 committed by GitHub
commit 010697ec97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/ASC.MessagingSystem/Data/MessagesRepository.cs
View File

@ -197,5 +197,6 @@ public static class MessagesRepositoryExtension
public static void Register(DIHelper services)
{
services.TryAdd<DbContextManager<MessagesContext>>();
services.TryAdd<EventTypeConverter>();
}
}

1
common/ASC.MessagingSystem/Mapping/EventTypeConverter.cs
View File

@ -26,6 +26,7 @@
namespace ASC.MessagingSystem.Mapping;
[Scope]
public class EventTypeConverter : ITypeConverter<EventMessage, LoginEvent>, ITypeConverter<EventMessage, AuditEvent>
{
public LoginEvent Convert(EventMessage source, LoginEvent destination, ResolutionContext context)

1
common/services/ASC.AuditTrail/Models/Mappings/EventTypeConverter.cs
View File

@ -26,6 +26,7 @@
namespace ASC.AuditTrail.Models.Mappings;
[Scope]
public class EventTypeConverter : ITypeConverter<LoginEventQuery, LoginEventDto>,
ITypeConverter<AuditEventQuery, AuditEventDto>
{

10
common/services/ASC.AuditTrail/Repositories/AuditEventsRepository.cs
View File

@ -26,7 +26,7 @@
namespace ASC.AuditTrail.Repositories;
[Scope]
[Scope(Additional = typeof(AuditEventsRepositoryExtensions))]
public class AuditEventsRepository
{
private MessagesContext AuditTrailContext => _lazyAuditTrailContext.Value;
@ -93,4 +93,12 @@ public class AuditEventsRepository
return _mapper.Map<List<AuditEventQuery>, IEnumerable<AuditEventDto>>(query.ToList());
}
}
public static class AuditEventsRepositoryExtensions
{
public static void Register(DIHelper services)
{
services.TryAdd<EventTypeConverter>();
}
}

10
common/services/ASC.AuditTrail/Repositories/LoginEventsRepository.cs
View File

@ -26,7 +26,7 @@
namespace ASC.AuditTrail.Repositories;
[Scope]
[Scope(Additional = typeof(LoginEventsRepositoryExtensions))]
public class LoginEventsRepository
{
private MessagesContext MessagesContext => _lazyMessagesContext.Value;
@ -93,4 +93,12 @@ public class LoginEventsRepository
return query.Count();
}
}
public static class LoginEventsRepositoryExtensions
{
public static void Register(DIHelper services)
{
services.TryAdd<EventTypeConverter>();
}
}

6
web/ASC.Web.Api/Api/Settings/TipsController.cs
View File

@ -107,4 +107,10 @@ public class TipsController: BaseSettingsController
{
return StudioPeriodicNotify.ChangeSubscription(_authContext.CurrentAccount.ID, _studioNotifyHelper);
}
[Read("tips/subscription")]
public bool GetTipsSubscription()
{
return _studioNotifyHelper.IsSubscribedToNotify(_authContext.CurrentAccount.ID, Actions.PeriodicNotify);
}
}