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

telegram: remove cache from dao

Browse Source
This commit is contained in:
Alexey Bannov 2022-05-17 21:57:18 +03:00
parent 16cc806615
commit addf33bf5a
5 changed files with 16 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
common/ASC.Core.Common/Notify/Telegram/Dao/CachedTelegramDao.cs
View File

@ -1,124 +0,0 @@
// (c) Copyright Ascensio System SIA 2010-2022
//
// This program is a free software product.
// You can redistribute it and/or modify it under the terms
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
// any third-party rights.
//
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
//
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
//
// The interactive user interfaces in modified source and object code versions of the Program must
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
//
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
// trademark law for use of our trademarks.
//
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
namespace ASC.Core.Common.Notify.Telegram;
class ConfigureCachedTelegramDao : IConfigureNamedOptions<CachedTelegramDao>
{
private readonly IOptionsSnapshot<TelegramDao> _service;
private readonly ICache _cache;
public ConfigureCachedTelegramDao(IOptionsSnapshot<TelegramDao> service, ICache cache)
{
_service = service;
_cache = cache;
}
public void Configure(string name, CachedTelegramDao options)
{
Configure(options);
options.TgDao = _service.Get(name);
}
public void Configure(CachedTelegramDao options)
{
options.TgDao = _service.Value;
options.Cache = _cache;
options.Expiration = TimeSpan.FromMinutes(20);
options.PairKeyFormat = "tgUser:{0}:{1}";
options.SingleKeyFormat = "tgUser:{0}";
}
}
[Scope(typeof(ConfigureCachedTelegramDao))]
public class CachedTelegramDao
{
public TelegramDao TgDao { get; set; }
public ICache Cache { get; set; }
public TimeSpan Expiration { get; set; }
public string PairKeyFormat { get; set; }
public string SingleKeyFormat { get; set; }
public void Delete(Guid userId, int tenantId)
{
Cache.Remove(string.Format(PairKeyFormat, userId, tenantId));
TgDao.Delete(userId, tenantId);
}
public void Delete(int telegramId)
{
Cache.Remove(string.Format(SingleKeyFormat, telegramId));
TgDao.Delete(telegramId);
}
public TelegramUser GetUser(Guid userId, int tenantId)
{
var key = string.Format(PairKeyFormat, userId, tenantId);
var user = Cache.Get<TelegramUser>(key);
if (user != null)
{
return user;
}
user = TgDao.GetUser(userId, tenantId);
if (user != null)
{
Cache.Insert(key, user, Expiration);
}
return user;
}
public List<TelegramUser> GetUser(int telegramId)
{
var key = string.Format(SingleKeyFormat, telegramId);
var users = Cache.Get<List<TelegramUser>>(key);
if (users != null)
{
return users;
}
users = TgDao.GetUser(telegramId);
if (users.Count > 0)
{
Cache.Insert(key, users, Expiration);
}
return users;
}
public void RegisterUser(Guid userId, int tenantId, long telegramId)
{
TgDao.RegisterUser(userId, tenantId, telegramId);
var key = string.Format(PairKeyFormat, userId, tenantId);
Cache.Insert(key, new TelegramUser { PortalUserId = userId, TenantId = tenantId, TelegramUserId = telegramId }, Expiration);
}
}

31
common/ASC.Core.Common/Notify/Telegram/Dao/TelegramDao.cs
View File

@ -26,28 +26,7 @@
namespace ASC.Core.Common.Notify.Telegram;
public class ConfigureTelegramDaoService : IConfigureNamedOptions<TelegramDao>
{
private readonly DbContextManager<TelegramDbContext> _dbContextManager;
public ConfigureTelegramDaoService(DbContextManager<TelegramDbContext> dbContextManager)
{
_dbContextManager = dbContextManager;
}
public void Configure(string name, TelegramDao options)
{
Configure(options);
options.TelegramDbContext = _dbContextManager.Get(name);
}
public void Configure(TelegramDao options)
{
options.TelegramDbContext = _dbContextManager.Value;
}
}
[Scope(typeof(ConfigureTelegramDaoService))]
[Scope]
public class TelegramDao
{
public TelegramDbContext TelegramDbContext { get; set; }
@ -71,13 +50,9 @@ public class TelegramDao
TelegramDbContext.SaveChanges();
}
public TelegramUser GetUser(Guid userId, long tenantId)
public TelegramUser GetUser(Guid userId, int tenantId)
{
return TelegramDbContext.Users
.AsNoTracking()
.Where(r => r.PortalUserId == userId)
.Where(r => r.TenantId == tenantId)
.FirstOrDefault();
return TelegramDbContext.Users.Find(tenantId, userId);
}
public List<TelegramUser> GetUser(long telegramId)

10
common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs
View File

@ -37,20 +37,20 @@ public class TelegramHelper
}
private readonly ConsumerFactory _consumerFactory;
private readonly CachedTelegramDao _cachedTelegramDao;
private readonly TelegramDao _telegramDao;
private readonly TelegramServiceClient _telegramServiceClient;
private readonly IHttpClientFactory _httpClientFactory;
private readonly ILog _logger;
public TelegramHelper(
ConsumerFactory consumerFactory,
IOptionsSnapshot<CachedTelegramDao> cachedTelegramDao,
TelegramDao telegramDao,
TelegramServiceClient telegramServiceClient,
IHttpClientFactory httpClientFactory,
ILog logger)
{
_consumerFactory = consumerFactory;
_cachedTelegramDao = cachedTelegramDao.Value;
_telegramDao = telegramDao;
_telegramServiceClient = telegramServiceClient;
_httpClientFactory = httpClientFactory;
_logger = logger;
@ -87,7 +87,7 @@ public class TelegramHelper
public RegStatus UserIsConnected(Guid userId, int tenantId)
{
if (_cachedTelegramDao.GetUser(userId, tenantId) != null)
if (_telegramDao.GetUser(userId, tenantId) != null)
{
return RegStatus.Registered;
}
@ -113,7 +113,7 @@ public class TelegramHelper
public void Disconnect(Guid userId, int tenantId)
{
_cachedTelegramDao.Delete(userId, tenantId);
_telegramDao.Delete(userId, tenantId);
}
private bool IsAwaitingRegistration(Guid userId, int tenantId)

10
common/services/ASC.TelegramService/Commands/UserCommands.cs
View File

@ -29,11 +29,11 @@ namespace ASC.TelegramService.Commands;
[Scope]
public class UserCommands : CommandContext
{
private readonly CachedTelegramDao _cachedTelegramDao;
private readonly TelegramDao _telegramDao;
public UserCommands(IOptionsSnapshot<CachedTelegramDao> cachedTelegramDao)
public UserCommands(TelegramDao telegramDao)
{
_cachedTelegramDao = cachedTelegramDao.Value;
_telegramDao = telegramDao;
}
[Command("start")]
@ -61,8 +61,10 @@ public class UserCommands : CommandContext
if (tenant == TenantId)
{
_cachedTelegramDao.RegisterUser(guid, tenant, Context.User.Id);
_telegramDao.RegisterUser(guid, tenant, Context.User.Id);
await ReplyAsync("Ok!");
return;
}
}

4
common/services/ASC.TelegramService/TelegramHandler.cs
View File

@ -49,13 +49,13 @@ public class TelegramHandler
if (!_clients.ContainsKey(msg.TenantId)) return;
var scope = _scopeFactory.CreateScope();
var cachedTelegramDao = scope.ServiceProvider.GetService<IOptionsSnapshot<CachedTelegramDao>>().Value;
var telegramDao = scope.ServiceProvider.GetService<TelegramDao>();
var client = _clients[msg.TenantId].Client;
try
{
var tgUser = cachedTelegramDao.GetUser(Guid.Parse(msg.Reciever), msg.TenantId);
var tgUser = telegramDao.GetUser(Guid.Parse(msg.Reciever), msg.TenantId);
if (tgUser == null)
{