6245535001

Committed 20 Sep 2023 07:44AM UTC coverage: 57.013%. First build

Build # 6245535001

Build Type

push

github

Committed by

web-flow

Commit Message

8.1.0 Release (#1628)

* Bump Newtonsoft.Json from 13.0.1 to 13.0.2

Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 13.0.1 to 13.0.2.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/13.0.1...13.0.2)

---
updated-dependencies:
- dependency-name: Newtonsoft.Json
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump NLog from 5.0.5 to 5.1.0

Bumps [NLog](https://github.com/NLog/NLog) from 5.0.5 to 5.1.0.
- [Release notes](https://github.com/NLog/NLog/releases)
- [Changelog](https://github.com/NLog/NLog/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/NLog/NLog/compare/v5.0.5...v5.1.0)

---
updated-dependencies:
- dependency-name: NLog
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump NLog from 5.0.5 to 5.1.0

* Fix -r flag - should have been --results-directory all along

* Bump Newtonsoft.Json from 13.0.1 to 13.0.2

* Bump YamlDotNet from 12.0.2 to 12.1.0

Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 12.0.2 to 12.1.0.
- [Release notes](https://github.com/aaubry/YamlDotNet/releases)
- [Commits](https://github.com/aaubry/YamlDotNet/compare/v12.0.2...v12.1.0)

---
updated-dependencies:
- dependency-name: YamlDotNet
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump Moq from 4.18.2 to 4.18.3

Bumps [Moq](https://github.com/moq/moq4) from 4.18.2 to 4.18.3.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/main/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/compare/v4.18.2...v4.18.3)

---
updated-dependencies:
- dependency-name: Moq
... (continued)

Run Details

10732 of 20257 branches covered (0.0%)

Branch coverage included in aggregate %.

48141 of 48141 new or added lines in 1086 files covered. (100.0%)

30685 of 52388 relevant lines covered (58.57%)

7387.88 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

72.0

/Rdmp.Core/DataLoad/Engine/LoadProcess/Scheduling/SingleJobScheduledDataLoadProcess.cs

// Copyright (c) The University of Dundee 2018-2019
// This file is part of the Research Data Management Platform (RDMP).
// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.

using System;
using System.Linq;
using Rdmp.Core.Curation.Data.DataLoad;
using Rdmp.Core.DataFlowPipeline;
using Rdmp.Core.DataLoad.Engine.DatabaseManagement.EntityNaming;
using Rdmp.Core.DataLoad.Engine.Job.Scheduling;
using Rdmp.Core.DataLoad.Engine.LoadExecution;
using Rdmp.Core.DataLoad.Engine.LoadProcess.Scheduling.Strategy;
using Rdmp.Core.Logging;
using Rdmp.Core.Repositories;
using Rdmp.Core.ReusableLibraryCode.Checks;
using Rdmp.Core.ReusableLibraryCode.Progress;

namespace Rdmp.Core.DataLoad.Engine.LoadProcess.Scheduling;

/// <summary>
/// DataLoadProcess for LoadMetadata's which have one or more LoadProgresses (See ScheduledDataLoadProcess).  This version of ScheduledDataLoadProcess will
/// run a single execution of a LoadProgress.  For example if you have a load 'Load biochemistry records' with a LoadProgress which 'loads 5 days at a time'
/// and is currently at LoadProgress.DataLoadProgress of 2001-01-01 it will run a single load (See ScheduledDataLoadJob) for the next 5 days and then stop.
/// </summary>
public class SingleJobScheduledDataLoadProcess : ScheduledDataLoadProcess
{
    private SingleScheduledJobFactory _scheduledJobFactory;

    // todo: refactor to cut down on ctor params
    public SingleJobScheduledDataLoadProcess(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
        ILoadMetadata loadMetadata, ICheckable preExecutionChecker, IDataLoadExecution loadExecution,
        JobDateGenerationStrategyFactory jobDateGenerationStrategyFactory,
        ILoadProgressSelectionStrategy loadProgressSelectionStrategy, int? overrideNumberOfDaysToLoad,
        ILogManager logManager, IDataLoadEventListener dataLoadEventListener, HICDatabaseConfiguration configuration) :
        base(repositoryLocator, loadMetadata, preExecutionChecker, loadExecution, jobDateGenerationStrategyFactory,
            loadProgressSelectionStrategy, overrideNumberOfDaysToLoad, logManager, dataLoadEventListener, configuration)
    {
    }

    public override ExitCodeType Run(GracefulCancellationToken loadCancellationToken, object payload = null)
    {
        // single job, so grab the first available LoadProgress and lock it
        var loadProgresses = LoadProgressSelectionStrategy.GetAllLoadProgresses();
        if (!loadProgresses.Any())
            return ExitCodeType.OperationNotRequired;

        var loadProgress = loadProgresses.First();

        // we don't need any other schedules the strategy may have given us
        loadProgresses.Remove(loadProgress);

        // Create the job factory
        if (_scheduledJobFactory != null)
            throw new Exception("Job factory should only be created once");

        _scheduledJobFactory = new SingleScheduledJobFactory(loadProgress,
            JobDateGenerationStrategyFactory.Create(loadProgress, DataLoadEventListener),
            OverrideNumberOfDaysToLoad ?? loadProgress.DefaultNumberOfDaysToLoadEachTime, LoadMetadata, LogManager);

        // If the job factory won't produce any jobs we can bail out here
        if (!_scheduledJobFactory.HasJobs())
            return ExitCodeType.OperationNotRequired;

        // Run the data load
        JobProvider = _scheduledJobFactory;

        return base.Run(loadCancellationToken, payload);
    }
}

1	// Copyright (c) The University of Dundee 2018-2019
2	// This file is part of the Research Data Management Platform (RDMP).
3	// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
4	// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
5	// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.
6
7	using System;
8	using System.Linq;
9	using Rdmp.Core.Curation.Data.DataLoad;
10	using Rdmp.Core.DataFlowPipeline;
11	using Rdmp.Core.DataLoad.Engine.DatabaseManagement.EntityNaming;
12	using Rdmp.Core.DataLoad.Engine.Job.Scheduling;
13	using Rdmp.Core.DataLoad.Engine.LoadExecution;
14	using Rdmp.Core.DataLoad.Engine.LoadProcess.Scheduling.Strategy;
15	using Rdmp.Core.Logging;
16	using Rdmp.Core.Repositories;
17	using Rdmp.Core.ReusableLibraryCode.Checks;
18	using Rdmp.Core.ReusableLibraryCode.Progress;
19
20	namespace Rdmp.Core.DataLoad.Engine.LoadProcess.Scheduling;
21
22	/// <summary>
23	/// DataLoadProcess for LoadMetadata's which have one or more LoadProgresses (See ScheduledDataLoadProcess). This version of ScheduledDataLoadProcess will
24	/// run a single execution of a LoadProgress. For example if you have a load 'Load biochemistry records' with a LoadProgress which 'loads 5 days at a time'
25	/// and is currently at LoadProgress.DataLoadProgress of 2001-01-01 it will run a single load (See ScheduledDataLoadJob) for the next 5 days and then stop.
26	/// </summary>
27	public class SingleJobScheduledDataLoadProcess : ScheduledDataLoadProcess
28	{
29	private SingleScheduledJobFactory _scheduledJobFactory;
30
31	// todo: refactor to cut down on ctor params
32	public SingleJobScheduledDataLoadProcess(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
33	ILoadMetadata loadMetadata, ICheckable preExecutionChecker, IDataLoadExecution loadExecution,
34	JobDateGenerationStrategyFactory jobDateGenerationStrategyFactory,
35	ILoadProgressSelectionStrategy loadProgressSelectionStrategy, int? overrideNumberOfDaysToLoad,
36	ILogManager logManager, IDataLoadEventListener dataLoadEventListener, HICDatabaseConfiguration configuration) :
37	base(repositoryLocator, loadMetadata, preExecutionChecker, loadExecution, jobDateGenerationStrategyFactory,	2✔
38	loadProgressSelectionStrategy, overrideNumberOfDaysToLoad, logManager, dataLoadEventListener, configuration)	2✔
39	{
40	}	2✔
41
42	public override ExitCodeType Run(GracefulCancellationToken loadCancellationToken, object payload = null)
43	{
44	// single job, so grab the first available LoadProgress and lock it
45	var loadProgresses = LoadProgressSelectionStrategy.GetAllLoadProgresses();	2✔
46	if (!loadProgresses.Any())	2!
47	return ExitCodeType.OperationNotRequired;	×
48
49	var loadProgress = loadProgresses.First();	2✔
50
51	// we don't need any other schedules the strategy may have given us
52	loadProgresses.Remove(loadProgress);	2✔
53
54	// Create the job factory
55	if (_scheduledJobFactory != null)	2!
56	throw new Exception("Job factory should only be created once");	×
57
58	_scheduledJobFactory = new SingleScheduledJobFactory(loadProgress,	2!
59	JobDateGenerationStrategyFactory.Create(loadProgress, DataLoadEventListener),	2✔
60	OverrideNumberOfDaysToLoad ?? loadProgress.DefaultNumberOfDaysToLoadEachTime, LoadMetadata, LogManager);	2✔
61
62	// If the job factory won't produce any jobs we can bail out here
63	if (!_scheduledJobFactory.HasJobs())	2!
64	return ExitCodeType.OperationNotRequired;	×
65
66	// Run the data load
67	JobProvider = _scheduledJobFactory;	2✔
68
69	return base.Run(loadCancellationToken, payload);	2✔
70	}
71	}

HicServices / RDMP / 6245535001

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous