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

45.45

/Rdmp.Core/DataExport/DataExtraction/UserPicks/ExtractableDatasetBundle.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 System.Linq;
using Rdmp.Core.Curation.Data;
using Rdmp.Core.DataExport.Data;

namespace Rdmp.Core.DataExport.DataExtraction.UserPicks;

/// <summary>
/// The dataset and all additional content related to that dataset within an ExtractionConfiguration which is about to be extracted.  This includes
/// SupportingDocuments, Lookup tables etc).  This is a mutable class and allows you to 'DropContent' if you do not want to extract given parts (e.g. skip
/// the lookups).
/// </summary>
public class ExtractableDatasetBundle : Bundle, IExtractableDatasetBundle
{
    //The main dataset being extracted
    public IExtractableDataSet DataSet { get; private set; }

    //all the rest of the stuff that goes with the dataset
    public List<SupportingDocument> Documents { get; private set; }
    public List<SupportingSQLTable> SupportingSQL { get; private set; }
    public List<IBundledLookupTable> LookupTables { get; private set; }


    public ExtractableDatasetBundle(IExtractableDataSet dataSet, SupportingDocument[] documents,
        SupportingSQLTable[] supportingSQL, ITableInfo[] lookupTables) :
        base(
            new[] { (object)dataSet }.Union(documents).Union(supportingSQL).Union(lookupTables)
                .ToArray() //pass all the objects to the base class so it can allocate initial States
        )
    {
        DataSet = dataSet;
        Documents = documents.ToList();
        SupportingSQL = supportingSQL.ToList();
        LookupTables = lookupTables.Select(t => new BundledLookupTable(t)).Cast<IBundledLookupTable>().ToList();
    }

    public ExtractableDatasetBundle(IExtractableDataSet dataSet)
        : this(dataSet, Array.Empty<SupportingDocument>(), Array.Empty<SupportingSQLTable>(), Array.Empty<TableInfo>())
    {
    }

    public override string ToString() => $"{DataSet} Bundle";

    protected override void OnDropContent(object toDrop)
    {
        switch (toDrop)
        {
            case ExtractableDataSet:
                throw new NotSupportedException(
                    $"Cannot drop {toDrop} from Bundle {this}, you cannot perform an extraction without the dataset component (only documents/lookups etc are optional)");
            case SupportingDocument drop:
                Documents.Remove(drop);
                return;
            case SupportingSQLTable item:
                SupportingSQL.Remove(item);
                return;
            case BundledLookupTable table:
                LookupTables.Remove(table);
                return;
            default:
                throw new NotSupportedException($"Did not know how to drop object of type {toDrop}");
        }
    }
}

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 System.Linq;
10	using Rdmp.Core.Curation.Data;
11	using Rdmp.Core.DataExport.Data;
12
13	namespace Rdmp.Core.DataExport.DataExtraction.UserPicks;
14
15	/// <summary>
16	/// The dataset and all additional content related to that dataset within an ExtractionConfiguration which is about to be extracted. This includes
17	/// SupportingDocuments, Lookup tables etc). This is a mutable class and allows you to 'DropContent' if you do not want to extract given parts (e.g. skip
18	/// the lookups).
19	/// </summary>
20	public class ExtractableDatasetBundle : Bundle, IExtractableDatasetBundle
21	{
22	//The main dataset being extracted
23	public IExtractableDataSet DataSet { get; private set; }	1,556✔
24
25	//all the rest of the stuff that goes with the dataset
26	public List<SupportingDocument> Documents { get; private set; }	252✔
27	public List<SupportingSQLTable> SupportingSQL { get; private set; }	252✔
28	public List<IBundledLookupTable> LookupTables { get; private set; }	252✔
29
30
31	public ExtractableDatasetBundle(IExtractableDataSet dataSet, SupportingDocument[] documents,
32	SupportingSQLTable[] supportingSQL, ITableInfo[] lookupTables) :
33	base(	204✔
34	new[] { (object)dataSet }.Union(documents).Union(supportingSQL).Union(lookupTables)	204✔
35	.ToArray() //pass all the objects to the base class so it can allocate initial States	204✔
36	)	204✔
37	{
38	DataSet = dataSet;	204✔
39	Documents = documents.ToList();	204✔
40	SupportingSQL = supportingSQL.ToList();	204✔
41	LookupTables = lookupTables.Select(t => new BundledLookupTable(t)).Cast<IBundledLookupTable>().ToList();	206✔
42	}	204✔
43
44	public ExtractableDatasetBundle(IExtractableDataSet dataSet)
45	: this(dataSet, Array.Empty<SupportingDocument>(), Array.Empty<SupportingSQLTable>(), Array.Empty<TableInfo>())	180✔
46	{
47	}	180✔
48
49	public override string ToString() => $"{DataSet} Bundle";	×
50
51	protected override void OnDropContent(object toDrop)
52	{
53	switch (toDrop)
54	{
55	case ExtractableDataSet:
56	throw new NotSupportedException(	×
57	$"Cannot drop {toDrop} from Bundle {this}, you cannot perform an extraction without the dataset component (only documents/lookups etc are optional)");	×
58	case SupportingDocument drop:
59	Documents.Remove(drop);	×
60	return;	×
61	case SupportingSQLTable item:
62	SupportingSQL.Remove(item);	×
63	return;	×
64	case BundledLookupTable table:
65	LookupTables.Remove(table);	×
66	return;	×
67	default:
68	throw new NotSupportedException($"Did not know how to drop object of type {toDrop}");	×
69	}
70	}
71	}

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