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

78.57

/Rdmp.Core/DataLoad/Engine/Job/Scheduling/UpdateProgressIfLoadsuccessful.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.ReusableLibraryCode.Progress;

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

/// <summary>
/// Data Load Engine disposal step for scheduled data loads (See ScheduledDataLoadJob) in which the LoadProgress head pointer date is updated.  E.g. if the
/// job was to load 5 days then the LoadProgress.DataLoadProgress date would be updated to reflect the loaded date range.  This is non trivial because it might
/// be that although the job was to load 100 days the source data read ended after 10 days so you might only want to update the DataLoadProgress date by 10
/// days on teh assumption that more data will appear later to fill that gap.
/// </summary>
public class UpdateProgressIfLoadsuccessful : IUpdateLoadProgress
{
    protected readonly ScheduledDataLoadJob Job;


    public DateTime DateToSetProgressTo;

    public UpdateProgressIfLoadsuccessful(ScheduledDataLoadJob job)
    {
        Job = job;

        if (Job.DatesToRetrieve == null || !Job.DatesToRetrieve.Any())
            throw new DataLoadProgressUpdateException(
                "Job does not have any DatesToRetrieve! collection was null or empty");

        DateToSetProgressTo = Job.DatesToRetrieve.Max();
    }

    public virtual void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
    {
        if (exitCode != ExitCodeType.Success)
            return;

        var progress = Job.LoadProgress;

        if (progress.DataLoadProgress > DateToSetProgressTo)
            throw new DataLoadProgressUpdateException(
                $"Cannot set DataLoadProgress to {DateToSetProgressTo} because it is less than the currently recorded progress:{progress.DataLoadProgress}");

        postLoadEventListener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
            $"Updating DataLoadProgress of '{progress}' to {DateToSetProgressTo}"));
        progress.DataLoadProgress = DateToSetProgressTo;

        progress.SaveToDatabase();
    }
}

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.ReusableLibraryCode.Progress;
10
11	namespace Rdmp.Core.DataLoad.Engine.Job.Scheduling;
12
13	/// <summary>
14	/// Data Load Engine disposal step for scheduled data loads (See ScheduledDataLoadJob) in which the LoadProgress head pointer date is updated. E.g. if the
15	/// job was to load 5 days then the LoadProgress.DataLoadProgress date would be updated to reflect the loaded date range. This is non trivial because it might
16	/// be that although the job was to load 100 days the source data read ended after 10 days so you might only want to update the DataLoadProgress date by 10
17	/// days on teh assumption that more data will appear later to fill that gap.
18	/// </summary>
19	public class UpdateProgressIfLoadsuccessful : IUpdateLoadProgress
20	{
21	protected readonly ScheduledDataLoadJob Job;
22
23
24	public DateTime DateToSetProgressTo;
25
26	public UpdateProgressIfLoadsuccessful(ScheduledDataLoadJob job)	8✔
27	{
28	Job = job;	8✔
29
30	if (Job.DatesToRetrieve == null \|\| !Job.DatesToRetrieve.Any())	8✔
31	throw new DataLoadProgressUpdateException(	2✔
32	"Job does not have any DatesToRetrieve! collection was null or empty");	2✔
33
34	DateToSetProgressTo = Job.DatesToRetrieve.Max();	6✔
35	}	6✔
36
37	public virtual void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
38	{
39	if (exitCode != ExitCodeType.Success)	2!
40	return;	×
41
42	var progress = Job.LoadProgress;	2✔
43
44	if (progress.DataLoadProgress > DateToSetProgressTo)	2!
45	throw new DataLoadProgressUpdateException(	×
46	$"Cannot set DataLoadProgress to {DateToSetProgressTo} because it is less than the currently recorded progress:{progress.DataLoadProgress}");	×
47
48	postLoadEventListener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,	2✔
49	$"Updating DataLoadProgress of '{progress}' to {DateToSetProgressTo}"));	2✔
50	progress.DataLoadProgress = DateToSetProgressTo;	2✔
51
52	progress.SaveToDatabase();	2✔
53	}	2✔
54	}

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