Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using EntityDb.Abstractions.Snapshots;
using EntityDb.Abstractions.Transactions;
using EntityDb.Abstractions.ValueObjects;
using System.Threading;
using System.Threading.Tasks;

namespace EntityDb.Abstractions.Projections;
Expand Down Expand Up @@ -31,6 +32,7 @@ public interface IProjectionRepository<TProjection> : IDisposableResource
/// Returns the current state of a <typeparamref name="TProjection" />.
/// </summary>
/// <param name="projectionId">The id of the projection.</param>
/// <param name="cancellationToken">A cancellation token.</param>
/// <returns>The current state of a <typeparamref name="TProjection" />.</returns>
Task<TProjection> GetCurrent(Id projectionId);
Task<TProjection> GetCurrent(Id projectionId, CancellationToken cancellationToken = default);
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Threading;
using System.Threading.Tasks;

namespace EntityDb.Abstractions.Projections;
Expand All @@ -13,7 +14,8 @@ public interface IProjectionRepositoryFactory<TProjection>
/// </summary>
/// <param name="transactionSessionOptionsName">The agent's use case for the transaction repository.</param>
/// <param name="snapshotSessionOptionsName">The agent's use case for the snapshot repository.</param>
/// <param name="cancellationToken">A cancellation token.</param>
/// <returns>A new instance of <see cref="IProjectionRepository{TProjection}" />.</returns>
Task<IProjectionRepository<TProjection>> CreateRepository(string transactionSessionOptionsName,
string snapshotSessionOptionsName);
string snapshotSessionOptionsName, CancellationToken cancellationToken = default);
}
4 changes: 3 additions & 1 deletion src/EntityDb.Common/Entities/EntityRepository.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ public EntityRepository

public async Task<TEntity> GetCurrent(Id entityId, CancellationToken cancellationToken = default)
{
var entity = await SnapshotRepository.GetSnapshotOrDefault(entityId) ?? TEntity.Construct(entityId);
var entity = SnapshotRepository is not null
? await SnapshotRepository.GetSnapshot(entityId, cancellationToken) ?? TEntity.Construct(entityId)
: TEntity.Construct(entityId);

var versionNumber = entity.GetVersionNumber();

Expand Down
18 changes: 0 additions & 18 deletions src/EntityDb.Common/Extensions/SnapshotRepositoryExtensions.cs

This file was deleted.

21 changes: 15 additions & 6 deletions src/EntityDb.Common/Projections/ProjectionRepository.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using EntityDb.Common.Queries;
using Microsoft.Extensions.DependencyInjection;
using System;
using System.Threading;
using System.Threading.Tasks;

namespace EntityDb.Common.Projections;
Expand All @@ -15,23 +16,25 @@ internal sealed class ProjectionRepository<TProjection> : DisposableResourceBase
{
public IProjectionStrategy<TProjection> ProjectionStrategy { get; }
public ITransactionRepository TransactionRepository { get; }
public ISnapshotRepository<TProjection> SnapshotRepository { get; }
public ISnapshotRepository<TProjection>? SnapshotRepository { get; }

public ProjectionRepository
(
IProjectionStrategy<TProjection> projectionStrategy,
ISnapshotRepository<TProjection> snapshotRepository,
ITransactionRepository transactionRepository
ITransactionRepository transactionRepository,
ISnapshotRepository<TProjection>? snapshotRepository = null
)
{
ProjectionStrategy = projectionStrategy;
TransactionRepository = transactionRepository;
SnapshotRepository = snapshotRepository;
}

public async Task<TProjection> GetCurrent(Id projectionId)
public async Task<TProjection> GetCurrent(Id projectionId, CancellationToken cancellationToken)
{
var projection = await SnapshotRepository.GetSnapshot(projectionId) ?? TProjection.Construct(projectionId);
var projection = SnapshotRepository is not null
? await SnapshotRepository.GetSnapshot(projectionId, cancellationToken) ?? TProjection.Construct(projectionId)
: TProjection.Construct(projectionId);

var entityIds = await ProjectionStrategy.GetEntityIds(projectionId, projection);

Expand All @@ -58,9 +61,15 @@ public static ProjectionRepository<TProjection> Create
(
IServiceProvider serviceProvider,
ITransactionRepository transactionRepository,
ISnapshotRepository<TProjection> snapshotRepository
ISnapshotRepository<TProjection>? snapshotRepository = null
)
{
if (snapshotRepository is null)
{
return ActivatorUtilities.CreateInstance<ProjectionRepository<TProjection>>(serviceProvider,
transactionRepository);
}

return ActivatorUtilities.CreateInstance<ProjectionRepository<TProjection>>(serviceProvider,
transactionRepository, snapshotRepository);
}
Expand Down
18 changes: 13 additions & 5 deletions src/EntityDb.Common/Projections/ProjectionRepositoryFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using EntityDb.Abstractions.Snapshots;
using EntityDb.Abstractions.Transactions;
using System;
using System.Threading;
using System.Threading.Tasks;

namespace EntityDb.Common.Projections;
Expand All @@ -11,27 +12,34 @@ internal class ProjectionRepositoryFactory<TProjection> : IProjectionRepositoryF
{
private readonly IServiceProvider _serviceProvider;
private readonly ITransactionRepositoryFactory _transactionRepositoryFactory;
private readonly ISnapshotRepositoryFactory<TProjection> _snapshotRepositoryFactory;
private readonly ISnapshotRepositoryFactory<TProjection>? _snapshotRepositoryFactory;

public ProjectionRepositoryFactory
(
IServiceProvider serviceProvider,
ITransactionRepositoryFactory transactionRepositoryFactory,
ISnapshotRepositoryFactory<TProjection> snapshotRepositoryFactory
ISnapshotRepositoryFactory<TProjection>? snapshotRepositoryFactory = null
)
{
_serviceProvider = serviceProvider;
_transactionRepositoryFactory = transactionRepositoryFactory;
_snapshotRepositoryFactory = snapshotRepositoryFactory;
}

public async Task<IProjectionRepository<TProjection>> CreateRepository(string transactionSessionOptionsName, string snapshotSessionOptionsName)
public async Task<IProjectionRepository<TProjection>> CreateRepository(string transactionSessionOptionsName,
string? snapshotSessionOptionsName = null, CancellationToken cancellationToken = default)
{
var transactionRepository =
await _transactionRepositoryFactory.CreateRepository(transactionSessionOptionsName);
await _transactionRepositoryFactory.CreateRepository(transactionSessionOptionsName, cancellationToken);

if (_snapshotRepositoryFactory is null || snapshotSessionOptionsName is null)
{
return ProjectionRepository<TProjection>.Create(_serviceProvider,
transactionRepository);
}

var snapshotRepository =
await _snapshotRepositoryFactory.CreateRepository(snapshotSessionOptionsName);
await _snapshotRepositoryFactory.CreateRepository(snapshotSessionOptionsName, cancellationToken);

return ProjectionRepository<TProjection>.Create(_serviceProvider,
transactionRepository, snapshotRepository);
Expand Down
19 changes: 11 additions & 8 deletions test/EntityDb.Common.Tests/Projections/ProjectionsTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ private async Task Generic_Given_When_Then<TProjection>(TransactionsAdder transa

await using var projectionRepository = await serviceScope.ServiceProvider
.GetRequiredService<IProjectionRepositoryFactory<OneToOneProjection>>()
.CreateRepository(TestSessionOptions.Write, TestSessionOptions.Write);
.CreateRepository(TestSessionOptions.Write, TestSessionOptions.Write, default);

// ACT

Expand Down Expand Up @@ -76,13 +76,13 @@ private async Task

await using var projectionRepository = await serviceScope.ServiceProvider
.GetRequiredService<IProjectionRepositoryFactory<OneToOneProjection>>()
.CreateRepository(TestSessionOptions.Write, TestSessionOptions.Write);
.CreateRepository(TestSessionOptions.Write, TestSessionOptions.Write, default);

// ACT

var actualEntityIds = await projectionStrategy.GetEntityIds(projectionId, default!);

var actualProjection = await projectionRepository.GetCurrent(projectionId);
var actualProjection = await projectionRepository.GetCurrent(projectionId, default);

// ASSERT

Expand All @@ -107,11 +107,11 @@ private async Task Generic_GivenEmptyTransactionRepository_WhenGettingProjection

await using var projectionRepository = await serviceScope.ServiceProvider
.GetRequiredService<IProjectionRepositoryFactory<OneToOneProjection>>()
.CreateRepository(TestSessionOptions.Write, TestSessionOptions.Write);
.CreateRepository(TestSessionOptions.Write, TestSessionOptions.Write, default);

// ACT

var actualProjection = await projectionRepository.GetCurrent(projectionId);
var actualProjection = await projectionRepository.GetCurrent(projectionId, default);

// ASSERT

Expand Down Expand Up @@ -145,7 +145,8 @@ private async Task Generic_GivenTransactionCommitted_WhenGettingProjection_ThenR

await using var projectionRepository = await serviceScope.ServiceProvider
.GetRequiredService<IProjectionRepositoryFactory<OneToOneProjection>>()
.CreateRepository(TestSessionOptions.Write, TestSessionOptions.Write);
.CreateRepository(TestSessionOptions.Write, TestSessionOptions.Write, default);


var transactionInserted = await entityRepository.PutTransaction(transaction);

Expand All @@ -154,10 +155,12 @@ private async Task Generic_GivenTransactionCommitted_WhenGettingProjection_ThenR
numberOfVersionNumbers.ShouldBeGreaterThan(replaceAtVersionNumber);

transactionInserted.ShouldBeTrue();


projectionRepository.SnapshotRepository.ShouldNotBeNull();

// ACT

var currentProjection = await projectionRepository.GetCurrent(projectionId);
var currentProjection = await projectionRepository.GetCurrent(projectionId, default);
var projectionSnapshot = await projectionRepository.SnapshotRepository.GetSnapshot(projectionId);

// ASSERT
Expand Down