From 5cfe7e08eca3fa5c3c766c9ce18a3b99704087ce Mon Sep 17 00:00:00 2001
From: MaksimChegulov <maksim.chegulov@onlyoffice.com>
Date: Fri, 18 Mar 2022 13:31:02 +0300
Subject: [PATCH 1/2] added registration mapping converters

---
 common/ASC.MessagingSystem/Data/MessagesRepository.cs  |  1 +
 .../ASC.MessagingSystem/Mapping/EventTypeConverter.cs  |  1 +
 .../Models/Mappings/EventTypeConverter.cs              |  1 +
 .../Repositories/AuditEventsRepository.cs              | 10 +++++++++-
 .../Repositories/LoginEventsRepository.cs              | 10 +++++++++-
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/common/ASC.MessagingSystem/Data/MessagesRepository.cs b/common/ASC.MessagingSystem/Data/MessagesRepository.cs
index 0d24b519ff..c84abcc6ba 100644
--- a/common/ASC.MessagingSystem/Data/MessagesRepository.cs
+++ b/common/ASC.MessagingSystem/Data/MessagesRepository.cs
@@ -197,5 +197,6 @@ public static class MessagesRepositoryExtension
     public static void Register(DIHelper services)
     {
         services.TryAdd<DbContextManager<MessagesContext>>();
+        services.TryAdd<EventTypeConverter>();
     }
 }
diff --git a/common/ASC.MessagingSystem/Mapping/EventTypeConverter.cs b/common/ASC.MessagingSystem/Mapping/EventTypeConverter.cs
index 94dec9951e..ee1568c6a5 100644
--- a/common/ASC.MessagingSystem/Mapping/EventTypeConverter.cs
+++ b/common/ASC.MessagingSystem/Mapping/EventTypeConverter.cs
@@ -1,5 +1,6 @@
 namespace ASC.MessagingSystem.Mapping;
 
+[Scope]
 public class EventTypeConverter : ITypeConverter<EventMessage, LoginEvent>, ITypeConverter<EventMessage, AuditEvent>
 {
     public LoginEvent Convert(EventMessage source, LoginEvent destination, ResolutionContext context)
diff --git a/common/services/ASC.AuditTrail/Models/Mappings/EventTypeConverter.cs b/common/services/ASC.AuditTrail/Models/Mappings/EventTypeConverter.cs
index aa966f0ce7..b9f72b90f1 100644
--- a/common/services/ASC.AuditTrail/Models/Mappings/EventTypeConverter.cs
+++ b/common/services/ASC.AuditTrail/Models/Mappings/EventTypeConverter.cs
@@ -1,5 +1,6 @@
 namespace ASC.AuditTrail.Models.Mappings;
 
+[Scope]
 public class EventTypeConverter : ITypeConverter<LoginEventQuery, LoginEventDto>, 
                                   ITypeConverter<AuditEventQuery, AuditEventDto>
 {
diff --git a/common/services/ASC.AuditTrail/Repositories/AuditEventsRepository.cs b/common/services/ASC.AuditTrail/Repositories/AuditEventsRepository.cs
index 855ec34d5f..028cb90504 100644
--- a/common/services/ASC.AuditTrail/Repositories/AuditEventsRepository.cs
+++ b/common/services/ASC.AuditTrail/Repositories/AuditEventsRepository.cs
@@ -25,7 +25,7 @@
 
 namespace ASC.AuditTrail.Repositories;
 
-[Scope]
+[Scope(Additional = typeof(AuditEventsRepositoryExtensions))]
 public class AuditEventsRepository
 {
     private MessagesContext AuditTrailContext => _lazyAuditTrailContext.Value;
@@ -92,4 +92,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>();
+    }
 }
\ No newline at end of file
diff --git a/common/services/ASC.AuditTrail/Repositories/LoginEventsRepository.cs b/common/services/ASC.AuditTrail/Repositories/LoginEventsRepository.cs
index 9b7e1622b0..171a6c6239 100644
--- a/common/services/ASC.AuditTrail/Repositories/LoginEventsRepository.cs
+++ b/common/services/ASC.AuditTrail/Repositories/LoginEventsRepository.cs
@@ -25,7 +25,7 @@
 
 namespace ASC.AuditTrail.Repositories;
 
-[Scope]
+[Scope(Additional = typeof(LoginEventsRepositoryExtensions))]
 public class LoginEventsRepository
 {
     private MessagesContext MessagesContext => _lazyMessagesContext.Value;
@@ -92,4 +92,12 @@ public class LoginEventsRepository
 
         return query.Count();
     }
+}
+
+public static class LoginEventsRepositoryExtensions
+{
+    public static void Register(DIHelper services)
+    {
+        services.TryAdd<EventTypeConverter>();
+    }
 }
\ No newline at end of file

From d207bcee3a4ec2359e93806ef3b3fa817876a844 Mon Sep 17 00:00:00 2001
From: MaksimChegulov <maksim.chegulov@onlyoffice.com>
Date: Fri, 18 Mar 2022 13:38:40 +0300
Subject: [PATCH 2/2] added missing method

---
 web/ASC.Web.Api/Api/Settings/TipsController.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/web/ASC.Web.Api/Api/Settings/TipsController.cs b/web/ASC.Web.Api/Api/Settings/TipsController.cs
index 9e8f10a095..64156244c8 100644
--- a/web/ASC.Web.Api/Api/Settings/TipsController.cs
+++ b/web/ASC.Web.Api/Api/Settings/TipsController.cs
@@ -81,4 +81,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);
+    }
 }