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

0.0

/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandResetExtractionProgress.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.Collections.Generic;
using System.Linq;
using Rdmp.Core.Curation.Data;
using Rdmp.Core.DataExport.Data;
using Rdmp.Core.Repositories.Construction;

namespace Rdmp.Core.CommandExecution.AtomicCommands;

/// <summary>
/// Clears progress recorded in an <see cref="ExtractionProgress"/>
/// </summary>
public class ExecuteCommandResetExtractionProgress : BasicCommandExecution
{
    private List<IExtractionProgress> _toClear = new();

    /// <summary>
    /// Clears one or more <see cref="ExtractionProgress"/> on a single <see cref="ExtractionConfiguration"/>
    /// </summary>
    /// <param name="activator"></param>
    /// <param name="config"></param>
    /// <param name="catalogue"></param>
    [UseWithObjectConstructor]
    public ExecuteCommandResetExtractionProgress(IBasicActivateItems activator,
        [DemandsInitialization("The configuration to clear progress for")]
        ExtractionConfiguration config,
        [DemandsInitialization(
            "Optional.  Pass null to clear all progress for all datasets.  Or pass a single Catalogue to reset progress for it only")]
        Catalogue catalogue) : base(activator)
    {
        foreach (var sds in config.SelectedDataSets)
            if (catalogue == null || sds.ExtractableDataSet.Catalogue_ID == catalogue.ID)
                AddClearTarget(sds);

        EvaluateIsImpossible();
    }

    public ExecuteCommandResetExtractionProgress(IBasicActivateItems activator, SelectedDataSets sds) : base(activator)
    {
        AddClearTarget(sds);

        EvaluateIsImpossible();
    }

    public ExecuteCommandResetExtractionProgress(IBasicActivateItems activator, ExtractionProgress progress) :
        base(activator)
    {
        if (progress.ProgressDate != null) _toClear.Add(progress);

        EvaluateIsImpossible();
    }

    private void EvaluateIsImpossible()
    {
        if (_toClear.Count == 0) SetImpossible("There are no ExtractionProgress underway which could be cleared");
    }

    private void AddClearTarget(ISelectedDataSets sds)
    {
        var progress = sds.ExtractionProgressIfAny;

        if (progress?.ProgressDate != null) _toClear.Add(progress);
    }

    public override void Execute()
    {
        base.Execute();

        foreach (var progress in _toClear)
        {
            progress.ProgressDate = null;
            progress.SaveToDatabase();
        }

        var config = _toClear.FirstOrDefault()?.SelectedDataSets?.ExtractionConfiguration;
        if (config != null) Publish(config);
    }
}

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.Collections.Generic;
8	using System.Linq;
9	using Rdmp.Core.Curation.Data;
10	using Rdmp.Core.DataExport.Data;
11	using Rdmp.Core.Repositories.Construction;
12
13	namespace Rdmp.Core.CommandExecution.AtomicCommands;
14
15	/// <summary>
16	/// Clears progress recorded in an <see cref="ExtractionProgress"/>
17	/// </summary>
18	public class ExecuteCommandResetExtractionProgress : BasicCommandExecution
19	{
20	private List<IExtractionProgress> _toClear = new();	×
21
22	/// <summary>
23	/// Clears one or more <see cref="ExtractionProgress"/> on a single <see cref="ExtractionConfiguration"/>
24	/// </summary>
25	/// <param name="activator"></param>
26	/// <param name="config"></param>
27	/// <param name="catalogue"></param>
28	[UseWithObjectConstructor]
29	public ExecuteCommandResetExtractionProgress(IBasicActivateItems activator,
30	[DemandsInitialization("The configuration to clear progress for")]
31	ExtractionConfiguration config,
32	[DemandsInitialization(
33	"Optional. Pass null to clear all progress for all datasets. Or pass a single Catalogue to reset progress for it only")]
34	Catalogue catalogue) : base(activator)	×
35	{
36	foreach (var sds in config.SelectedDataSets)	×
37	if (catalogue == null \|\| sds.ExtractableDataSet.Catalogue_ID == catalogue.ID)	×
38	AddClearTarget(sds);	×
39
40	EvaluateIsImpossible();	×
41	}	×
42
43	public ExecuteCommandResetExtractionProgress(IBasicActivateItems activator, SelectedDataSets sds) : base(activator)	×
44	{
45	AddClearTarget(sds);	×
46
47	EvaluateIsImpossible();	×
48	}	×
49
50	public ExecuteCommandResetExtractionProgress(IBasicActivateItems activator, ExtractionProgress progress) :
51	base(activator)	×
52	{
53	if (progress.ProgressDate != null) _toClear.Add(progress);	×
54
55	EvaluateIsImpossible();	×
56	}	×
57
58	private void EvaluateIsImpossible()
59	{
60	if (_toClear.Count == 0) SetImpossible("There are no ExtractionProgress underway which could be cleared");	×
61	}	×
62
63	private void AddClearTarget(ISelectedDataSets sds)
64	{
65	var progress = sds.ExtractionProgressIfAny;	×
66
67	if (progress?.ProgressDate != null) _toClear.Add(progress);	×
68	}	×
69
70	public override void Execute()
71	{
72	base.Execute();	×
73
74	foreach (var progress in _toClear)	×
75	{
76	progress.ProgressDate = null;	×
77	progress.SaveToDatabase();	×
78	}
79
80	var config = _toClear.FirstOrDefault()?.SelectedDataSets?.ExtractionConfiguration;	×
81	if (config != null) Publish(config);	×
82	}	×
83	}

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