* Start work * Introduce dto * Start making repository * Add migrations * Implement fetchable first job * Fix up to also finish tasks * Refactor jobs to distributed background jobs * Filter jobs correctly on LastRun * Hardcode delay * Add settings to configure delay and period * Fix formatting * Add default data * Add update on startup, which will update periods on startup * Refactor service to return job directly * Update src/Umbraco.Infrastructure/Services/Implement/DistributedJobService.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/Umbraco.Infrastructure/BackgroundJobs/DistributedBackgroundJobHostedService.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/Umbraco.Infrastructure/Migrations/Install/DatabaseDataCreator.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/Umbraco.Infrastructure/Migrations/Install/DatabaseDataCreator.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/Umbraco.Infrastructure/BackgroundJobs/DistributedBackgroundJobHostedService.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Remove unused * Move jobs and make internal * make OpenIddictCleanupJob.cs public, as it is used elsewhere * Minor docstring changes * Update src/Umbraco.Core/Persistence/Constants-Locks.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * ´Throw correct exceptions * Update xml doc * Remove business logic from repository * Remove more business logic from repository into service * Remove adding jobs from migration * fix creation * Rename to ExecuteAsync --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: mole <nikolajlauridsen@protonmail.ch>
87 lines
3.4 KiB
C#
87 lines
3.4 KiB
C#
// Copyright (c) Umbraco.
|
|
// See LICENSE for more details.
|
|
|
|
using System.Data;
|
|
using Microsoft.Extensions.Options;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Umbraco.Cms.Core.Configuration.Models;
|
|
using Umbraco.Cms.Core.Events;
|
|
using Umbraco.Cms.Core.Persistence.Repositories;
|
|
using Umbraco.Cms.Core.Scoping;
|
|
using Umbraco.Cms.Infrastructure.BackgroundJobs.Jobs;
|
|
using Umbraco.Cms.Infrastructure.BackgroundJobs.Jobs.DistributedJobs;
|
|
|
|
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.BackgroundJobs.Jobs;
|
|
|
|
public class CacheInstructionsPruningJobTests
|
|
{
|
|
private readonly Mock<IOptions<GlobalSettings>> _globalSettingsMock = new(MockBehavior.Strict);
|
|
private readonly Mock<ICacheInstructionRepository> _cacheInstructionRepositoryMock = new(MockBehavior.Strict);
|
|
private readonly Mock<ICoreScopeProvider> _scopeProviderMock = new(MockBehavior.Strict);
|
|
private readonly Mock<TimeProvider> _timeProviderMock = new(MockBehavior.Strict);
|
|
|
|
[Test]
|
|
public void Run_Period_Is_Retrieved_From_GlobalSettings()
|
|
{
|
|
var timeBetweenPruneOperations = TimeSpan.FromMinutes(2);
|
|
var job = CreateCacheInstructionsPruningJob(timeBetweenPruneOperations);
|
|
Assert.AreEqual(timeBetweenPruneOperations, job.Period, "The run period should be the same as 'TimeBetweenPruneOperations'.");
|
|
}
|
|
|
|
[Test]
|
|
public async Task RunJobAsync_Calls_DeleteInstructionsOlderThan_With_Expected_Date()
|
|
{
|
|
SetupScopeProviderMock();
|
|
|
|
var timeToRetainInstructions = TimeSpan.FromMinutes(30);
|
|
var now = DateTime.UtcNow;
|
|
var expectedPruneDate = now - timeToRetainInstructions;
|
|
|
|
_timeProviderMock.Setup(tp => tp.GetUtcNow()).Returns(now);
|
|
_cacheInstructionRepositoryMock.Setup(repo => repo
|
|
.DeleteInstructionsOlderThan(expectedPruneDate));
|
|
|
|
var job = CreateCacheInstructionsPruningJob(timeToRetainInstructions: timeToRetainInstructions);
|
|
|
|
await job.ExecuteAsync();
|
|
|
|
_cacheInstructionRepositoryMock.Verify(repo => repo.DeleteInstructionsOlderThan(expectedPruneDate), Times.Once);
|
|
}
|
|
|
|
private CacheInstructionsPruningJob CreateCacheInstructionsPruningJob(
|
|
TimeSpan? timeBetweenPruneOperations = null,
|
|
TimeSpan? timeToRetainInstructions = null)
|
|
{
|
|
timeBetweenPruneOperations ??= TimeSpan.FromMinutes(5);
|
|
timeToRetainInstructions ??= TimeSpan.FromMinutes(20);
|
|
|
|
var globalSettings = new GlobalSettings
|
|
{
|
|
DatabaseServerMessenger = new DatabaseServerMessengerSettings
|
|
{
|
|
TimeBetweenPruneOperations = timeBetweenPruneOperations.Value,
|
|
TimeToRetainInstructions = timeToRetainInstructions.Value,
|
|
},
|
|
};
|
|
|
|
_globalSettingsMock
|
|
.Setup(g => g.Value)
|
|
.Returns(globalSettings);
|
|
|
|
return new CacheInstructionsPruningJob(_globalSettingsMock.Object, _cacheInstructionRepositoryMock.Object, _scopeProviderMock.Object, _timeProviderMock.Object);
|
|
}
|
|
|
|
private void SetupScopeProviderMock() =>
|
|
_scopeProviderMock
|
|
.Setup(x => x.CreateCoreScope(
|
|
It.IsAny<IsolationLevel>(),
|
|
It.IsAny<RepositoryCacheMode>(),
|
|
It.IsAny<IEventDispatcher>(),
|
|
It.IsAny<IScopedNotificationPublisher>(),
|
|
It.IsAny<bool?>(),
|
|
It.IsAny<bool>(),
|
|
It.IsAny<bool>()))
|
|
.Returns(Mock.Of<ICoreScope>());
|
|
}
|