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

44.74

/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAssociateCatalogueWithLoadMetadata.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.Linq;
using Rdmp.Core.Curation.Data;
using Rdmp.Core.Curation.Data.DataLoad;
using Rdmp.Core.Icons.IconProvision;
using Rdmp.Core.Repositories.Construction;
using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats;

namespace Rdmp.Core.CommandExecution.AtomicCommands;

public class ExecuteCommandAssociateCatalogueWithLoadMetadata : BasicCommandExecution, IAtomicCommand
{
    private readonly LoadMetadata _loadMetadata;
    private readonly Catalogue[] _availableCatalogues;
    private readonly ICatalogue[] _otherCatalogues;
    private Catalogue[] _chosenCatalogues;

    [UseWithObjectConstructor]
    public ExecuteCommandAssociateCatalogueWithLoadMetadata(IBasicActivateItems activator, LoadMetadata loadMetadata,
        Catalogue[] toAssociate) : this(activator, loadMetadata)
    {
        //if command is possible, select those that are available for association
        if (!IsImpossible)
        {
            _chosenCatalogues = _availableCatalogues.Intersect(toAssociate).ToArray();

            if (_chosenCatalogues.Length == 0)
                SetImpossible(
                    $"None of the provided Catalogues are available for association with the LoadMetadata '{loadMetadata}'");
        }
    }

    public ExecuteCommandAssociateCatalogueWithLoadMetadata(IBasicActivateItems activator, LoadMetadata loadMetadata) :
        base(activator)
    {
        _loadMetadata = loadMetadata;

        _availableCatalogues = BasicActivator.CoreChildProvider.AllCatalogues.Where(c => c.LoadMetadata_ID == null)
            .ToArray();
        //Ensure logging task is correct
        _otherCatalogues = _loadMetadata.GetAllCatalogues().ToArray();

        if (!_availableCatalogues.Any())
            SetImpossible("There are no Catalogues that are not associated with another Load already");
    }

    public override string GetCommandHelp() =>
        "Specifies that the table(s) underlying the dataset are loaded by the load configuration.  The union of all catalogue(s) table(s) will be used for RAW=>STAGING=>LIVE migration during DLE execution";

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

        if (_chosenCatalogues == null && !SelectMany(_availableCatalogues, out _chosenCatalogues))
            return;

        foreach (var cata in _chosenCatalogues)
        {
            //if there are other catalogues
            if (_otherCatalogues.Any())
            {
                var tasks = _otherCatalogues.Select(c => c.LoggingDataTask).Distinct().ToArray();
                //if the other catalogues have an agreed logging task
                if (tasks.Length == 1)
                {
                    var task = tasks.Single();

                    //and that logging task is not blank!, and differs from this Catalogue
                    if (!string.IsNullOrWhiteSpace(task) && !task.Equals(cata.LoggingDataTask))
                    {
                        var liveServers = _otherCatalogues.Where(c => c.LiveLoggingServer_ID != null)
                            .Select(c => c.LiveLoggingServer_ID).Distinct().ToArray();

                        //AND if there is agreement on what logging server to use!
                        if (liveServers.Length <= 1)
                            //if there is no current logging task for the Catalogue
                            if (string.IsNullOrWhiteSpace(cata.LoggingDataTask)
                                //or if the user wants to switch to the new one
                                || YesNo(
                                    $"Do you want to set Catalogue '{cata.Name}' to use shared logging task '{task}' instead of its current Logging Task '{cata.LoggingDataTask}' (All Catalogues in a load must share the same task and logging servers)?",
                                    "Synchronise Logging Tasks"))
                            {
                                //switch Catalogue to use that logging task (including servers)
                                cata.LoggingDataTask = task;
                                cata.LiveLoggingServer_ID = liveServers.SingleOrDefault();
                            }
                    }
                }
                else if (tasks.Length == 0)
                {
                    cata.LoggingDataTask = $"Loading {_loadMetadata.Name}";
                }
            }

            //associate them
            cata.LoadMetadata_ID = _loadMetadata.ID;
            cata.SaveToDatabase();
        }

        Publish(_loadMetadata);
    }

    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
        iconProvider.GetImage(RDMPConcept.Catalogue, OverlayKind.Add);

    public ICommandExecution SetTarget(Catalogue[] catalogues)
    {
        _chosenCatalogues = catalogues;
        if (_otherCatalogues.Any(catalogues.Contains))
            SetImpossible("Catalogue(s) are already part of the LoadMetadata");

        return this;
    }
}

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.Linq;
8	using Rdmp.Core.Curation.Data;
9	using Rdmp.Core.Curation.Data.DataLoad;
10	using Rdmp.Core.Icons.IconProvision;
11	using Rdmp.Core.Repositories.Construction;
12	using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision;
13	using SixLabors.ImageSharp;
14	using SixLabors.ImageSharp.PixelFormats;
15
16	namespace Rdmp.Core.CommandExecution.AtomicCommands;
17
18	public class ExecuteCommandAssociateCatalogueWithLoadMetadata : BasicCommandExecution, IAtomicCommand
19	{
20	private readonly LoadMetadata _loadMetadata;
21	private readonly Catalogue[] _availableCatalogues;
22	private readonly ICatalogue[] _otherCatalogues;
23	private Catalogue[] _chosenCatalogues;
24
25	[UseWithObjectConstructor]
26	public ExecuteCommandAssociateCatalogueWithLoadMetadata(IBasicActivateItems activator, LoadMetadata loadMetadata,
27	Catalogue[] toAssociate) : this(activator, loadMetadata)	2✔
28	{
29	//if command is possible, select those that are available for association
30	if (!IsImpossible)	2✔
31	{
32	_chosenCatalogues = _availableCatalogues.Intersect(toAssociate).ToArray();	2✔
33
34	if (_chosenCatalogues.Length == 0)	2!
35	SetImpossible(	×
36	$"None of the provided Catalogues are available for association with the LoadMetadata '{loadMetadata}'");	×
37	}
38	}	2✔
39
40	public ExecuteCommandAssociateCatalogueWithLoadMetadata(IBasicActivateItems activator, LoadMetadata loadMetadata) :
41	base(activator)	2✔
42	{
43	_loadMetadata = loadMetadata;	2✔
44
45	_availableCatalogues = BasicActivator.CoreChildProvider.AllCatalogues.Where(c => c.LoadMetadata_ID == null)	6✔
46	.ToArray();	2✔
47	//Ensure logging task is correct
48	_otherCatalogues = _loadMetadata.GetAllCatalogues().ToArray();	2✔
49
50	if (!_availableCatalogues.Any())	2!
51	SetImpossible("There are no Catalogues that are not associated with another Load already");	×
52	}	2✔
53
54	public override string GetCommandHelp() =>
55	"Specifies that the table(s) underlying the dataset are loaded by the load configuration. The union of all catalogue(s) table(s) will be used for RAW=>STAGING=>LIVE migration during DLE execution";	×
56
57	public override void Execute()
58	{
59	base.Execute();	2✔
60
61	if (_chosenCatalogues == null && !SelectMany(_availableCatalogues, out _chosenCatalogues))	2!
62	return;	×
63
64	foreach (var cata in _chosenCatalogues)	8✔
65	{
66	//if there are other catalogues
67	if (_otherCatalogues.Any())	2!
68	{
69	var tasks = _otherCatalogues.Select(c => c.LoggingDataTask).Distinct().ToArray();	×
70	//if the other catalogues have an agreed logging task
71	if (tasks.Length == 1)	×
72	{
73	var task = tasks.Single();	×
74
75	//and that logging task is not blank!, and differs from this Catalogue
76	if (!string.IsNullOrWhiteSpace(task) && !task.Equals(cata.LoggingDataTask))	×
77	{
78	var liveServers = _otherCatalogues.Where(c => c.LiveLoggingServer_ID != null)	×
79	.Select(c => c.LiveLoggingServer_ID).Distinct().ToArray();	×
80
81	//AND if there is agreement on what logging server to use!
82	if (liveServers.Length <= 1)	×
83	//if there is no current logging task for the Catalogue
84	if (string.IsNullOrWhiteSpace(cata.LoggingDataTask)	×
85	//or if the user wants to switch to the new one	×
86	\|\| YesNo(	×
87	$"Do you want to set Catalogue '{cata.Name}' to use shared logging task '{task}' instead of its current Logging Task '{cata.LoggingDataTask}' (All Catalogues in a load must share the same task and logging servers)?",	×
88	"Synchronise Logging Tasks"))	×
89	{
90	//switch Catalogue to use that logging task (including servers)
91	cata.LoggingDataTask = task;	×
92	cata.LiveLoggingServer_ID = liveServers.SingleOrDefault();	×
93	}
94	}
95	}
96	else if (tasks.Length == 0)	×
97	{
98	cata.LoggingDataTask = $"Loading {_loadMetadata.Name}";	×
99	}
100	}
101
102	//associate them
103	cata.LoadMetadata_ID = _loadMetadata.ID;	2✔
104	cata.SaveToDatabase();	2✔
105	}
106
107	Publish(_loadMetadata);	2✔
108	}	2✔
109
110	public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
111	iconProvider.GetImage(RDMPConcept.Catalogue, OverlayKind.Add);	×
112
113	public ICommandExecution SetTarget(Catalogue[] catalogues)
114	{
115	_chosenCatalogues = catalogues;	×
116	if (_otherCatalogues.Any(catalogues.Contains))	×
117	SetImpossible("Catalogue(s) are already part of the LoadMetadata");	×
118
119	return this;	×
120	}
121	}

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