Skip to content
This repository has been archived by the owner on Sep 3, 2023. It is now read-only.

refactor: extract table logic #433

Merged
merged 2 commits into from
Sep 18, 2022
Merged

refactor: extract table logic #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05f34f7
refactor: extract table worker to separated project
FrediKats Sep 17, 2022
8f4892a
feat: add new project to docker config
FrediKats Sep 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Docker/build.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ COPY ./Application/Kysect.Shreks.DataAccess.Abstractions/Kysect.Shreks.DataAcces
COPY ./Application/Kysect.Shreks.Application.Abstractions/Kysect.Shreks.Application.Abstractions.csproj ./Application/Kysect.Shreks.Application.Abstractions/Kysect.Shreks.Application.Abstractions.csproj
COPY ./Application/Kysect.Shreks.Application/Kysect.Shreks.Application.csproj ./Application/Kysect.Shreks.Application/Kysect.Shreks.Application.csproj
COPY ./Application/Kysect.Shreks.Application.Dto/Kysect.Shreks.Application.Dto.csproj ./Application/Kysect.Shreks.Application.Dto/Kysect.Shreks.Application.Dto.csproj
COPY ./Application/Kysect.Shreks.Application.TableManagement/Kysect.Shreks.Application.TableManagement.csproj ./Application/Kysect.Shreks.Application.TableManagement/Kysect.Shreks.Application.TableManagement.csproj
COPY ./Infrastructure/Kysect.Shreks.Seeding/Kysect.Shreks.Seeding.csproj ./Infrastructure/Kysect.Shreks.Seeding/Kysect.Shreks.Seeding.csproj
COPY ./Infrastructure/Integration/Kysect.Shreks.Integration.Github/Kysect.Shreks.Integration.Github.csproj ./Infrastructure/Integration/Kysect.Shreks.Integration.Github/Kysect.Shreks.Integration.Github.csproj
COPY ./Infrastructure/Integration/Kysect.Shreks.Integration.Google/Kysect.Shreks.Integration.Google.csproj ./Infrastructure/Integration/Kysect.Shreks.Integration.Google/Kysect.Shreks.Integration.Google.csproj
Expand Down
2 changes: 1 addition & 1 deletion ...ration.Google/Models/ConcurrentHashSet.cs → ...tion.TableManagement/ConcurrentHashSet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Kysect.Shreks.Integration.Google.Models;
namespace Kysect.Shreks.Application.TableManagement;

public class ConcurrentHashSet<T>
{
Expand Down
12 changes: 6 additions & 6 deletions ...gration.Google/GoogleTableUpdateWorker.cs → ...ableManagement/GoogleTableUpdateWorker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System.Diagnostics;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using System.Diagnostics;

namespace Kysect.Shreks.Integration.Google;
namespace Kysect.Shreks.Application.TableManagement;

public class GoogleTableUpdateWorker : BackgroundService
{
Expand Down Expand Up @@ -31,7 +31,7 @@ protected override async Task ExecuteAsync(CancellationToken token)
while (!token.IsCancellationRequested && await timer.WaitForNextTickAsync(token))
{
using IServiceScope serviceScope = _serviceProvider.CreateScope();
using var googleTableAccessor = serviceScope.ServiceProvider.GetRequiredService<GoogleTableAccessor>();
using var googleTableAccessor = serviceScope.ServiceProvider.GetRequiredService<ITableAccessor>();

_stopwatch.Restart();

Expand All @@ -45,7 +45,7 @@ protected override async Task ExecuteAsync(CancellationToken token)
}
}

private async Task<bool> UpdateTablePoints(GoogleTableAccessor googleTableAccessor, CancellationToken token)
private async Task<bool> UpdateTablePoints(ITableAccessor googleTableAccessor, CancellationToken token)
{
IReadOnlyCollection<Guid> points = _tableUpdateQueue
.PointsUpdateSubjectCourseIds
Expand All @@ -60,7 +60,7 @@ private async Task<bool> UpdateTablePoints(GoogleTableAccessor googleTableAccess
return points.Any();
}

private async Task<bool> UpdateTableQueue(GoogleTableAccessor googleTableAccessor, CancellationToken token)
private async Task<bool> UpdateTableQueue(ITableAccessor googleTableAccessor, CancellationToken token)
{
IReadOnlyCollection<(Guid, Guid)> queues = _tableUpdateQueue
.QueueUpdateSubjectCourseGroupIds
Expand Down
7 changes: 7 additions & 0 deletions Source/Application/Kysect.Shreks.Application.TableManagement/ITableAccessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
namespace Kysect.Shreks.Application.TableManagement;

public interface ITableAccessor : IDisposable
{
Task UpdatePointsAsync(Guid subjectCourseId, CancellationToken token);
Task UpdateQueueAsync(Guid subjectCourseId, Guid studentGroupId, CancellationToken token);
}
18 changes: 18 additions & 0 deletions ...ysect.Shreks.Application.TableManagement/Kysect.Shreks.Application.TableManagement.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Domain\Kysect.Shreks.Common\Kysect.Shreks.Common.csproj" />
<ProjectReference Include="..\Kysect.Shreks.Application.Abstractions\Kysect.Shreks.Application.Abstractions.csproj" />
</ItemGroup>

</Project>
3 changes: 1 addition & 2 deletions ...ks.Integration.Google/TableUpdateQueue.cs → ...ation.TableManagement/TableUpdateQueue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Kysect.Shreks.Application.Abstractions.Google;
using Kysect.Shreks.Integration.Google.Models;

namespace Kysect.Shreks.Integration.Google;
namespace Kysect.Shreks.Application.TableManagement;

public class TableUpdateQueue : ITableUpdateQueue
{
Expand Down
3 changes: 2 additions & 1 deletion ...re/Integration/Kysect.Shreks.Integration.Google/Extensions/ServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using Kysect.Shreks.Application.Abstractions.Formatters;
using Kysect.Shreks.Application.Abstractions.Google;
using Kysect.Shreks.Application.Dto.Tables;
using Kysect.Shreks.Application.TableManagement;
using Kysect.Shreks.Integration.Google.Options;
using Kysect.Shreks.Integration.Google.Providers;
using Kysect.Shreks.Integration.Google.Sheets;
Expand Down Expand Up @@ -56,7 +57,7 @@ private static IServiceCollection AddGoogleTableUpdateWorker(this IServiceCollec
return serviceCollection
.AddSingleton<TableUpdateQueue>()
.AddSingleton<ITableUpdateQueue>(p => p.GetRequiredService<TableUpdateQueue>())
.AddScoped<GoogleTableAccessor>()
.AddScoped<ITableAccessor, GoogleTableAccessor>()
.AddHostedService<GoogleTableUpdateWorker>();
}

Expand Down
3 changes: 2 additions & 1 deletion Source/Infrastructure/Integration/Kysect.Shreks.Integration.Google/GoogleTableAccessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
using Kysect.Shreks.Application.Abstractions.Google.Commands;
using Kysect.Shreks.Application.Abstractions.Google.Queries;
using Kysect.Shreks.Application.Dto.Tables;
using Kysect.Shreks.Application.TableManagement;
using Kysect.Shreks.Integration.Google.Sheets;
using Kysect.Shreks.Integration.Google.Tools;
using MediatR;
using Microsoft.Extensions.Logging;

namespace Kysect.Shreks.Integration.Google;

public class GoogleTableAccessor : IDisposable
public class GoogleTableAccessor : ITableAccessor
{
private readonly SemaphoreSlim _spreadsheetCreationSemaphore;

Expand Down
4 changes: 2 additions & 2 deletions ...ture/Integration/Kysect.Shreks.Integration.Google/Kysect.Shreks.Integration.Google.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
</ItemGroup>

<ItemGroup>
<ProjectReference
Include="..\..\..\Application\Kysect.Shreks.Application.Abstractions\Kysect.Shreks.Application.Abstractions.csproj" />
<ProjectReference Include="..\..\..\Application\Kysect.Shreks.Application.Abstractions\Kysect.Shreks.Application.Abstractions.csproj" />
<ProjectReference Include="..\..\..\Application\Kysect.Shreks.Application.TableManagement\Kysect.Shreks.Application.TableManagement.csproj" />
</ItemGroup>

</Project>
3 changes: 2 additions & 1 deletion Source/Kysect.Shreks.WebApi/Controllers/GoogleController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Kysect.Shreks.Integration.Google;
using Kysect.Shreks.Application.TableManagement;
using Kysect.Shreks.Integration.Google;
using Microsoft.AspNetCore.Mvc;

namespace Kysect.Shreks.WebApi.Controllers
Expand Down
7 changes: 7 additions & 0 deletions Source/Kysect.Shreks.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.editorconfig = .editorconfig
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kysect.Shreks.Application.TableManagement", "Application\Kysect.Shreks.Application.TableManagement\Kysect.Shreks.Application.TableManagement.csproj", "{A57B6F3D-1DC1-41A7-90CD-99158B4D55DA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -166,6 +168,10 @@ Global
{3B0EB40E-6E3C-4F8D-BBD7-9B7FC5FB7D68}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3B0EB40E-6E3C-4F8D-BBD7-9B7FC5FB7D68}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3B0EB40E-6E3C-4F8D-BBD7-9B7FC5FB7D68}.Release|Any CPU.Build.0 = Release|Any CPU
{A57B6F3D-1DC1-41A7-90CD-99158B4D55DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A57B6F3D-1DC1-41A7-90CD-99158B4D55DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A57B6F3D-1DC1-41A7-90CD-99158B4D55DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A57B6F3D-1DC1-41A7-90CD-99158B4D55DA}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -195,6 +201,7 @@ Global
{601BCCAB-8895-43CB-BC46-EE2C20F4031F} = {DC866D57-D41E-455D-BD7D-85F1DD575823}
{DF0C2310-8F92-404C-885E-D495B3F334EB} = {AE556858-2A9D-481F-9235-3C74F0CDC5A5}
{3B0EB40E-6E3C-4F8D-BBD7-9B7FC5FB7D68} = {AE556858-2A9D-481F-9235-3C74F0CDC5A5}
{A57B6F3D-1DC1-41A7-90CD-99158B4D55DA} = {AE556858-2A9D-481F-9235-3C74F0CDC5A5}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {CD5C67DB-70F8-4C47-A3F4-7C94BECE1657}
Expand Down
1 change: 1 addition & 0 deletions Source/Playground/Kysect.Shreks.Playground.Google/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Google.Apis.Auth.OAuth2;
using Kysect.Shreks.Application.Abstractions.Google;
using Kysect.Shreks.Application.Extensions;
using Kysect.Shreks.Application.TableManagement;
using Kysect.Shreks.DataAccess.Context;
using Kysect.Shreks.Integration.Google;
using Kysect.Shreks.Integration.Google.Extensions;
Expand Down
1 change: 1 addition & 0 deletions Source/Tests/Kysect.Shreks.Tests/Application/UpdateSubmissionStateHandlerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using FluentAssertions;
using Kysect.Shreks.Application.Commands.Processors;
using Kysect.Shreks.Application.TableManagement;
using Kysect.Shreks.Core.Models;
using Kysect.Shreks.Core.Submissions;
using Kysect.Shreks.Integration.Google;
Expand Down