glenux-archive/cloutier--bird.makeup
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

better DI

Browse source
This commit is contained in:
Nicolas Constant 2021-02-02 22:49:37 -05:00
parent 299ad64269
commit 2e8313301b
No known key found for this signature in database
GPG key ID: 1E9F677FB01A5688
4 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/BirdsiteLive.Pipeline/Processors/RetrieveTweetsProcessor.cs
View file

@ -17,12 +17,12 @@ namespace BirdsiteLive.Pipeline.Processors
public class RetrieveTweetsProcessor : IRetrieveTweetsProcessor public class RetrieveTweetsProcessor : IRetrieveTweetsProcessor
{ {
private readonly ITwitterTweetsService _twitterTweetsService; private readonly ITwitterTweetsService _twitterTweetsService;
private readonly ITwitterUserService _twitterUserService; private readonly ICachedTwitterUserService _twitterUserService;
private readonly ITwitterUserDal _twitterUserDal; private readonly ITwitterUserDal _twitterUserDal;
private readonly ILogger<RetrieveTweetsProcessor> _logger; private readonly ILogger<RetrieveTweetsProcessor> _logger;
#region Ctor #region Ctor
public RetrieveTweetsProcessor(ITwitterTweetsService twitterTweetsService, ITwitterUserDal twitterUserDal, ITwitterUserService twitterUserService, ILogger<RetrieveTweetsProcessor> logger) public RetrieveTweetsProcessor(ITwitterTweetsService twitterTweetsService, ITwitterUserDal twitterUserDal, ICachedTwitterUserService twitterUserService, ILogger<RetrieveTweetsProcessor> logger)
{ {
_twitterTweetsService = twitterTweetsService; _twitterTweetsService = twitterTweetsService;
_twitterUserDal = twitterUserDal; _twitterUserDal = twitterUserDal;
@ -77,13 +77,8 @@ namespace BirdsiteLive.Pipeline.Processors
} }
catch (Exception e) catch (Exception e)
{ {
_logger.LogError(e, "Error retrieving TL of {Username} from {LastTweetPostedId}", user.Acct, user.LastTweetPostedId); _logger.LogError(e, "Error retrieving TL of {Username} from {LastTweetPostedId}, purging user from cache", user.Acct, user.LastTweetPostedId);
_twitterUserService.PurgeUser(user.Acct);
if (_twitterUserService is CachedTwitterUserService service)
{
_logger.LogInformation("Purge {Username} from cache", user.Acct);
service.PurgeUser(user.Acct);
}
} }
return tweets; return tweets;

7
src/BirdsiteLive.Twitter/CachedTwitterService.cs
View file

@ -4,7 +4,12 @@ using Microsoft.Extensions.Caching.Memory;
namespace BirdsiteLive.Twitter namespace BirdsiteLive.Twitter
{ {
public class CachedTwitterUserService : ITwitterUserService public interface ICachedTwitterUserService : ITwitterUserService
{
void PurgeUser(string username);
}
public class CachedTwitterUserService : ICachedTwitterUserService
{ {
private readonly ITwitterUserService _twitterService; private readonly ITwitterUserService _twitterService;

10
src/Tests/BirdsiteLive.Pipeline.Tests/BirdsiteLive.Pipeline.Tests.csproj
View file

@ -14,12 +14,14 @@
<PackageReference Include="coverlet.collector" Version="1.2.0" /> <PackageReference Include="coverlet.collector" Version="1.2.0" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\BirdsiteLive.Pipeline\BirdsiteLive.Pipeline.csproj" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Tools\" /> <Folder Include="Tools\" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\BirdsiteLive.Pipeline\BirdsiteLive.Pipeline.csproj" />
<ProjectReference Include="..\..\BirdsiteLive.Twitter\BirdsiteLive.Twitter.csproj" />
<ProjectReference Include="..\..\DataAccessLayers\BirdsiteLive.DAL\BirdsiteLive.DAL.csproj" />
</ItemGroup>
</Project> </Project>

6
src/Tests/BirdsiteLive.Pipeline.Tests/Processors/RetrieveTweetsProcessorTests.cs
View file

@ -61,7 +61,7 @@ namespace BirdsiteLive.Pipeline.Tests.Processors
)) ))
.Returns(Task.CompletedTask); .Returns(Task.CompletedTask);
var twitterUserServiceMock = new Mock<ITwitterUserService>(MockBehavior.Strict); var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict);
var logger = new Mock<ILogger<RetrieveTweetsProcessor>>(MockBehavior.Strict); var logger = new Mock<ILogger<RetrieveTweetsProcessor>>(MockBehavior.Strict);
#endregion #endregion
@ -125,7 +125,7 @@ namespace BirdsiteLive.Pipeline.Tests.Processors
var twitterUserDalMock = new Mock<ITwitterUserDal>(MockBehavior.Strict); var twitterUserDalMock = new Mock<ITwitterUserDal>(MockBehavior.Strict);
var twitterUserServiceMock = new Mock<ITwitterUserService>(MockBehavior.Strict); var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict);
var logger = new Mock<ILogger<RetrieveTweetsProcessor>>(MockBehavior.Strict); var logger = new Mock<ILogger<RetrieveTweetsProcessor>>(MockBehavior.Strict);
#endregion #endregion
@ -192,7 +192,7 @@ namespace BirdsiteLive.Pipeline.Tests.Processors
var twitterUserDalMock = new Mock<ITwitterUserDal>(MockBehavior.Strict); var twitterUserDalMock = new Mock<ITwitterUserDal>(MockBehavior.Strict);
var twitterUserServiceMock = new Mock<ITwitterUserService>(MockBehavior.Strict); var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict);
var logger = new Mock<ILogger<RetrieveTweetsProcessor>>(MockBehavior.Strict); var logger = new Mock<ILogger<RetrieveTweetsProcessor>>(MockBehavior.Strict);
#endregion #endregion