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

81.58

/Rdmp.Core/Caching/Requests/FetchRequestProvider/CacheFetchRequestProvider.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 Rdmp.Core.Curation.Data;
using Rdmp.Core.Curation.Data.Cache;
using Rdmp.Core.ReusableLibraryCode.Progress;

namespace Rdmp.Core.Caching.Requests.FetchRequestProvider;

public class CacheFetchRequestProvider : ICacheFetchRequestProvider
{
    protected ICacheProgress CacheProgress { get; }
    public IPermissionWindow PermissionWindow { get; set; }

    private ICacheFetchRequest _initialRequest;
    public ICacheFetchRequest Current { get; private set; }

    /// <summary>
    /// Sets up the class to generate <see cref="ICacheFetchRequest"/> for the given <see cref="ICacheProgress"/>
    /// </summary>
    /// <param name="cacheProgress">The cache which the request is for, this must have either an <see cref="ICacheProgress.CacheFillProgress"/> or its
    /// <see cref="ILoadProgress"/> parent must have a populated <see cref="ILoadProgress.OriginDate"/></param>
    public CacheFetchRequestProvider(ICacheProgress cacheProgress)
    {
        CacheProgress = cacheProgress;
        PermissionWindow = CacheProgress.PermissionWindow;
    }

    /// <summary>
    /// Creates a new <see cref="ICacheFetchRequest"/> with a valid start date but no End.  To hydrate end you should use a <see cref="ICacheFetchRequestProvider"/>
    /// </summary>
    /// <returns></returns>
    public virtual ICacheFetchRequest CreateInitialRequest()
    {
        var lp = CacheProgress.LoadProgress;

        // Figure out when to start loading from
        DateTime startDate;
        if (CacheProgress.CacheFillProgress.HasValue)
            startDate = CacheProgress.CacheFillProgress.Value;
        else if (lp.OriginDate.HasValue)
            startDate = lp.OriginDate.Value;
        else
            throw new Exception(
                "Don't know when to begin loading the cache from. Neither CacheProgress or LoadProgress has a relevant date.");

        var initialFetchRequest = new CacheFetchRequest(CacheProgress.Repository)
        {
            CacheProgress = CacheProgress,
            ChunkPeriod = CacheProgress.ChunkPeriod,
            PermissionWindow = PermissionWindow,
            Start = startDate
        };

        return initialFetchRequest;
    }

    /// <summary>
    /// Returns the next <see cref="ICacheFetchRequest"/> based on the <see cref="Current"/>
    /// </summary>
    /// <param name="listener"></param>
    /// <returns></returns>
    public ICacheFetchRequest GetNext(IDataLoadEventListener listener) => _initialRequest == null
        ? Current = _initialRequest = CreateInitialRequest()
        : Current = CreateNext();

    private ICacheFetchRequest CreateNext()
    {
        var nextStart = Current.Start.Add(Current.ChunkPeriod);
        return new CacheFetchRequest(CacheProgress.Repository, nextStart)
        {
            CacheProgress = Current.CacheProgress,
            PermissionWindow = Current.PermissionWindow,
            ChunkPeriod = Current.ChunkPeriod
        };
    }
}

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 Rdmp.Core.Curation.Data;
9	using Rdmp.Core.Curation.Data.Cache;
10	using Rdmp.Core.ReusableLibraryCode.Progress;
11
12	namespace Rdmp.Core.Caching.Requests.FetchRequestProvider;
13
14	public class CacheFetchRequestProvider : ICacheFetchRequestProvider
15	{
16	protected ICacheProgress CacheProgress { get; }	90✔
17	public IPermissionWindow PermissionWindow { get; set; }	56✔
18
19	private ICacheFetchRequest _initialRequest;
20	public ICacheFetchRequest Current { get; private set; }	244✔
21
22	/// <summary>
23	/// Sets up the class to generate <see cref="ICacheFetchRequest"/> for the given <see cref="ICacheProgress"/>
24	/// </summary>
25	/// <param name="cacheProgress">The cache which the request is for, this must have either an <see cref="ICacheProgress.CacheFillProgress"/> or its
26	/// <see cref="ILoadProgress"/> parent must have a populated <see cref="ILoadProgress.OriginDate"/></param>
27	public CacheFetchRequestProvider(ICacheProgress cacheProgress)	26✔
28	{
29	CacheProgress = cacheProgress;	26✔
30	PermissionWindow = CacheProgress.PermissionWindow;	26✔
31	}	26✔
32
33	/// <summary>
34	/// Creates a new <see cref="ICacheFetchRequest"/> with a valid start date but no End. To hydrate end you should use a <see cref="ICacheFetchRequestProvider"/>
35	/// </summary>
36	/// <returns></returns>
37	public virtual ICacheFetchRequest CreateInitialRequest()
38	{
39	var lp = CacheProgress.LoadProgress;	4✔
40
41	// Figure out when to start loading from
42	DateTime startDate;
43	if (CacheProgress.CacheFillProgress.HasValue)	4!
44	startDate = CacheProgress.CacheFillProgress.Value;	4✔
45	else if (lp.OriginDate.HasValue)	×
46	startDate = lp.OriginDate.Value;	×
47	else
48	throw new Exception(	×
49	"Don't know when to begin loading the cache from. Neither CacheProgress or LoadProgress has a relevant date.");	×
50
51	var initialFetchRequest = new CacheFetchRequest(CacheProgress.Repository)	4✔
52	{	4✔
53	CacheProgress = CacheProgress,	4✔
54	ChunkPeriod = CacheProgress.ChunkPeriod,	4✔
55	PermissionWindow = PermissionWindow,	4✔
56	Start = startDate	4✔
57	};	4✔
58
59	return initialFetchRequest;	4✔
60	}
61
62	/// <summary>
63	/// Returns the next <see cref="ICacheFetchRequest"/> based on the <see cref="Current"/>
64	/// </summary>
65	/// <param name="listener"></param>
66	/// <returns></returns>
67	public ICacheFetchRequest GetNext(IDataLoadEventListener listener) => _initialRequest == null	44✔
68	? Current = _initialRequest = CreateInitialRequest()	44✔
69	: Current = CreateNext();	44✔
70
71	private ICacheFetchRequest CreateNext()
72	{
73	var nextStart = Current.Start.Add(Current.ChunkPeriod);	40✔
74	return new CacheFetchRequest(CacheProgress.Repository, nextStart)	40✔
75	{	40✔
76	CacheProgress = Current.CacheProgress,	40✔
77	PermissionWindow = Current.PermissionWindow,	40✔
78	ChunkPeriod = Current.ChunkPeriod	40✔
79	};	40✔
80	}
81	}

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