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

75.0

/Rdmp.Core/DataExport/DataExtraction/Commands/ExtractCommandCollectionFactory.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.DataExport.Data;
using Rdmp.Core.DataExport.DataExtraction.UserPicks;
using Rdmp.Core.Repositories;

namespace Rdmp.Core.DataExport.DataExtraction.Commands;

/// <summary>
/// Identifies all extractable components of a given ExtractionConfiguration (all datasets).  These are returned as an ExtractCommandCollection.
/// </summary>
public class ExtractCommandCollectionFactory
{
    public static ExtractCommandCollection Create(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
        ExtractionConfiguration configuration)
    {
        var cohort = configuration.Cohort;
        var datasets = configuration.GetAllExtractableDataSets();

        var datasetBundles = datasets.Select(ds => CreateDatasetCommand(repositoryLocator, ds, configuration));

        return new ExtractCommandCollection(datasetBundles);
    }

    private static ExtractDatasetCommand CreateDatasetCommand(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
        IExtractableDataSet dataset, IExtractionConfiguration configuration)
    {
        var catalogue = dataset.Catalogue;

        //get all extractable locals AND extractable globals first time then just extractable locals
        var docs = catalogue.GetAllSupportingDocuments(FetchOptions.ExtractableLocals);
        var sqls = catalogue.GetAllSupportingSQLTablesForCatalogue(FetchOptions.ExtractableLocals);

        //Now find all the lookups and include them into the bundle
        catalogue.GetTableInfos(out _, out var lookupsFound);

        //bundle consists of:
        var bundle = new ExtractableDatasetBundle(
            dataset, //the dataset
            docs, //all non global extractable docs (SupportingDocuments)
            sqls.Where(sql => sql.IsGlobal == false).ToArray(), //all non global extractable sql (SupportingSQL)
            lookupsFound.ToArray()); //all lookups associated with the Catalogue (the one behind the ExtractableDataset)

        return new ExtractDatasetCommand(configuration, bundle);
    }

    public static ExtractDatasetCommand Create(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
        ISelectedDataSets selectedDataSets) => CreateDatasetCommand(repositoryLocator,
        selectedDataSets.ExtractableDataSet, selectedDataSets.ExtractionConfiguration);
}

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.DataExport.Data;
10	using Rdmp.Core.DataExport.DataExtraction.UserPicks;
11	using Rdmp.Core.Repositories;
12
13	namespace Rdmp.Core.DataExport.DataExtraction.Commands;
14
15	/// <summary>
16	/// Identifies all extractable components of a given ExtractionConfiguration (all datasets). These are returned as an ExtractCommandCollection.
17	/// </summary>
18	public class ExtractCommandCollectionFactory
19	{
20	public static ExtractCommandCollection Create(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
21	ExtractionConfiguration configuration)
22	{
23	var cohort = configuration.Cohort;	×
24	var datasets = configuration.GetAllExtractableDataSets();	×
25
26	var datasetBundles = datasets.Select(ds => CreateDatasetCommand(repositoryLocator, ds, configuration));	×
27
28	return new ExtractCommandCollection(datasetBundles);	×
29	}
30
31	private static ExtractDatasetCommand CreateDatasetCommand(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
32	IExtractableDataSet dataset, IExtractionConfiguration configuration)
33	{
34	var catalogue = dataset.Catalogue;	24✔
35
36	//get all extractable locals AND extractable globals first time then just extractable locals
37	var docs = catalogue.GetAllSupportingDocuments(FetchOptions.ExtractableLocals);	24✔
38	var sqls = catalogue.GetAllSupportingSQLTablesForCatalogue(FetchOptions.ExtractableLocals);	24✔
39
40	//Now find all the lookups and include them into the bundle
41	catalogue.GetTableInfos(out _, out var lookupsFound);	24✔
42
43	//bundle consists of:
44	var bundle = new ExtractableDatasetBundle(	24✔
45	dataset, //the dataset	24✔
46	docs, //all non global extractable docs (SupportingDocuments)	24✔
47	sqls.Where(sql => sql.IsGlobal == false).ToArray(), //all non global extractable sql (SupportingSQL)	2✔
48	lookupsFound.ToArray()); //all lookups associated with the Catalogue (the one behind the ExtractableDataset)	24✔
49
50	return new ExtractDatasetCommand(configuration, bundle);	24✔
51	}
52
53	public static ExtractDatasetCommand Create(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
54	ISelectedDataSets selectedDataSets) => CreateDatasetCommand(repositoryLocator,	24✔
55	selectedDataSets.ExtractableDataSet, selectedDataSets.ExtractionConfiguration);	24✔
56	}

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