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

66.67

/Rdmp.Core/DataLoad/Engine/Job/Scheduling/SingleScheduleConsecutiveDateStrategy.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.Collections.Generic;
using Rdmp.Core.Curation.Data;
using Rdmp.Core.DataLoad.Engine.Job.Scheduling.Exceptions;

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

/// <summary>
/// Returns dates consecutively with reference to a LoadProgress, starting from the last successful load (DataLoadProgress) or OriginDate if no load has yet
/// been successfully completed
/// </summary>
public class SingleScheduleConsecutiveDateStrategy : IJobDateGenerationStrategy
{
    private DateTime _lastAssignedLoadDate;

    public SingleScheduleConsecutiveDateStrategy(ILoadProgress loadProgress)
    {
        if (loadProgress.DataLoadProgress == null)
        {
            if (loadProgress.OriginDate == null)
                throw new LoadOrCacheProgressUnclearException(
                    "Don't know when to start the data load, both DataLoadProgress and OriginDate are null");

            _lastAssignedLoadDate = loadProgress.OriginDate.Value;
        }
        else
        {
            _lastAssignedLoadDate = loadProgress.DataLoadProgress.Value;
        }
    }

    /// <summary>
    /// 
    /// </summary>
    /// <param name="batchSize"></param>
    /// <param name="allowLoadingFutureDates">if true then dates can be loaded that are in the future otherwise the returned list of dates will only contain dates in teh past</param>
    /// <returns></returns>
    public List<DateTime> GetDates(int batchSize, bool allowLoadingFutureDates)
    {
        var dates = new List<DateTime>();

        for (var i = 0; i < batchSize; i++)
        {
            _lastAssignedLoadDate = _lastAssignedLoadDate.Add(new TimeSpan(1, 0, 0, 0));

            //if we are about to order the loading of today or any later day
            if (_lastAssignedLoadDate.Date >= DateTime.Now.Date)
                if (!allowLoadingFutureDates) //if user does not want to load future dates
                    return dates; //he is done

            //it is not a future date or user wants to allow loading of future dates
            dates.Add(_lastAssignedLoadDate);
        }

        return dates;
    }

    public int GetTotalNumberOfJobs(int batchSize, bool allowLoadingFutureDates)
    {
        if (allowLoadingFutureDates)
            throw new NotImplementedException();

        var numberOfDays = DateTime.Now.Date.Subtract(_lastAssignedLoadDate.Date).Days;
        var totalNumberOfJobs = numberOfDays / batchSize;
        if (numberOfDays % batchSize > 0) ++totalNumberOfJobs;
        return totalNumberOfJobs;
    }
}

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.Collections.Generic;
9	using Rdmp.Core.Curation.Data;
10	using Rdmp.Core.DataLoad.Engine.Job.Scheduling.Exceptions;
11
12	namespace Rdmp.Core.DataLoad.Engine.Job.Scheduling;
13
14	/// <summary>
15	/// Returns dates consecutively with reference to a LoadProgress, starting from the last successful load (DataLoadProgress) or OriginDate if no load has yet
16	/// been successfully completed
17	/// </summary>
18	public class SingleScheduleConsecutiveDateStrategy : IJobDateGenerationStrategy
19	{
20	private DateTime _lastAssignedLoadDate;
21
22	public SingleScheduleConsecutiveDateStrategy(ILoadProgress loadProgress)	14✔
23	{
24	if (loadProgress.DataLoadProgress == null)	14✔
25	{
26	if (loadProgress.OriginDate == null)	2!
27	throw new LoadOrCacheProgressUnclearException(	2✔
28	"Don't know when to start the data load, both DataLoadProgress and OriginDate are null");	2✔
29
30	_lastAssignedLoadDate = loadProgress.OriginDate.Value;	×
31	}
32	else
33	{
34	_lastAssignedLoadDate = loadProgress.DataLoadProgress.Value;	12✔
35	}
36	}	12✔
37
38	/// <summary>
39	///
40	/// </summary>
41	/// <param name="batchSize"></param>
42	/// <param name="allowLoadingFutureDates">if true then dates can be loaded that are in the future otherwise the returned list of dates will only contain dates in teh past</param>
43	/// <returns></returns>
44	public List<DateTime> GetDates(int batchSize, bool allowLoadingFutureDates)
45	{
46	var dates = new List<DateTime>();	12✔
47
48	for (var i = 0; i < batchSize; i++)	448✔
49	{
50	_lastAssignedLoadDate = _lastAssignedLoadDate.Add(new TimeSpan(1, 0, 0, 0));	218✔
51
52	//if we are about to order the loading of today or any later day
53	if (_lastAssignedLoadDate.Date >= DateTime.Now.Date)	218✔
54	if (!allowLoadingFutureDates) //if user does not want to load future dates	204✔
55	return dates; //he is done	6✔
56
57	//it is not a future date or user wants to allow loading of future dates
58	dates.Add(_lastAssignedLoadDate);	212✔
59	}
60
61	return dates;	6✔
62	}
63
64	public int GetTotalNumberOfJobs(int batchSize, bool allowLoadingFutureDates)
65	{
66	if (allowLoadingFutureDates)	×
67	throw new NotImplementedException();	×
68
69	var numberOfDays = DateTime.Now.Date.Subtract(_lastAssignedLoadDate.Date).Days;	×
70	var totalNumberOfJobs = numberOfDays / batchSize;	×
71	if (numberOfDays % batchSize > 0) ++totalNumberOfJobs;	×
72	return totalNumberOfJobs;	×
73	}
74	}

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