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

63.46

/Rdmp.Core/Repositories/MemoryDataExportRepository.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;
using Rdmp.Core.DataExport.DataRelease.Audit;
using Rdmp.Core.Repositories.Managers;

namespace Rdmp.Core.Repositories;

/// <summary>
/// Memory only implementation of <see cref="IDataExportRepository"/>.  Also implements <see cref="ICatalogueRepository"/>.  All objects are created in
/// dictionaries and arrays in memory instead of the database.
/// </summary>
public class MemoryDataExportRepository : MemoryCatalogueRepository, IDataExportRepository, IDataExportPropertyManager,
    IExtractableDataSetPackageManager
{
    public ICatalogueRepository CatalogueRepository => this;
    public IDataExportPropertyManager DataExportPropertyManager => this;
    public IExtractableDataSetPackageManager PackageManager => this;


    public CatalogueExtractabilityStatus GetExtractabilityStatus(ICatalogue c)
    {
        var eds = GetAllObjectsWithParent<ExtractableDataSet>(c).SingleOrDefault();

        return eds == null
            ? new CatalogueExtractabilityStatus(false, false)
            : new CatalogueExtractabilityStatus(true, eds.Project_ID != null);
    }

    public ISelectedDataSets[] GetSelectedDatasetsWithNoExtractionIdentifiers()
    {
        var col = GetAllObjects<ExtractableColumn>().Where(ec => ec.IsExtractionIdentifier).ToArray();

        return GetAllObjects<ISelectedDataSets>()
            .Where(sds => !col.Any(c => c.ExtractableDataSet_ID == sds.ExtractableDataSet_ID
                                        && c.ExtractionConfiguration_ID == sds.ExtractionConfiguration_ID)).ToArray();
    }


    #region IDataExportPropertyManager

    protected Dictionary<DataExportProperty, string> PropertiesDictionary = new();

    public virtual string GetValue(DataExportProperty property) =>
        PropertiesDictionary.TryGetValue(property, out var value) ? value : null;

    public virtual void SetValue(DataExportProperty property, string value)
    {
        PropertiesDictionary[property] = value;
    }

    #endregion


    #region IExtractableDataSetPackageManager

    protected Dictionary<IExtractableDataSetPackage, HashSet<IExtractableDataSet>> PackageDictionary { get; set; } =
        new();

    public IExtractableDataSet[] GetAllDataSets(IExtractableDataSetPackage package, IExtractableDataSet[] allDataSets)
    {
        if (!PackageDictionary.ContainsKey(package))
            PackageDictionary.Add(package, new HashSet<IExtractableDataSet>());

        return PackageDictionary[package].ToArray();
    }

    public virtual void AddDataSetToPackage(IExtractableDataSetPackage package, IExtractableDataSet dataSet)
    {
        if (!PackageDictionary.ContainsKey(package))
            PackageDictionary.Add(package, new HashSet<IExtractableDataSet>());

        PackageDictionary[package].Add(dataSet);
    }

    public virtual void RemoveDataSetFromPackage(IExtractableDataSetPackage package, IExtractableDataSet dataSet)
    {
        if (!PackageDictionary.ContainsKey(package))
            PackageDictionary.Add(package, new HashSet<IExtractableDataSet>());

        if (!PackageDictionary[package].Contains(dataSet))
            throw new ArgumentException($"dataSet {dataSet} is not part of package {package} so cannot be removed",
                nameof(dataSet));

        PackageDictionary[package].Remove(dataSet);
    }

    public Dictionary<int, List<int>> GetPackageContentsDictionary()
    {
        return PackageDictionary.ToDictionary(k => k.Key.ID, v => v.Value.Select(o => o.ID).ToList());
    }

    public IEnumerable<ICumulativeExtractionResults> GetAllCumulativeExtractionResultsFor(
        IExtractionConfiguration configuration, IExtractableDataSet dataset)
    {
        return GetAllObjects<CumulativeExtractionResults>().Where(e =>
            e.ExtractionConfiguration_ID == configuration.ID && e.ExtractableDataSet_ID == dataset.ID);
    }

    public IReleaseLog GetReleaseLogEntryIfAny(CumulativeExtractionResults cumulativeExtractionResults) =>
        GetAllObjectsWhere<ReleaseLog>("CumulativeExtractionResults_ID", cumulativeExtractionResults.ID)
            .SingleOrDefault();

    #endregion
}

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	using Rdmp.Core.DataExport.DataRelease.Audit;
13	using Rdmp.Core.Repositories.Managers;
14
15	namespace Rdmp.Core.Repositories;
16
17	/// <summary>
18	/// Memory only implementation of <see cref="IDataExportRepository"/>. Also implements <see cref="ICatalogueRepository"/>. All objects are created in
19	/// dictionaries and arrays in memory instead of the database.
20	/// </summary>
21	public class MemoryDataExportRepository : MemoryCatalogueRepository, IDataExportRepository, IDataExportPropertyManager,
22	IExtractableDataSetPackageManager
23	{
24	public ICatalogueRepository CatalogueRepository => this;	1,288✔
25	public IDataExportPropertyManager DataExportPropertyManager => this;	4✔
26	public IExtractableDataSetPackageManager PackageManager => this;	2✔
27
28
29	public CatalogueExtractabilityStatus GetExtractabilityStatus(ICatalogue c)
30	{
31	var eds = GetAllObjectsWithParent<ExtractableDataSet>(c).SingleOrDefault();	8✔
32
33	return eds == null	8✔
34	? new CatalogueExtractabilityStatus(false, false)	8✔
35	: new CatalogueExtractabilityStatus(true, eds.Project_ID != null);	8✔
36	}
37
38	public ISelectedDataSets[] GetSelectedDatasetsWithNoExtractionIdentifiers()
39	{
40	var col = GetAllObjects<ExtractableColumn>().Where(ec => ec.IsExtractionIdentifier).ToArray();	686✔
41
42	return GetAllObjects<ISelectedDataSets>()	584✔
43	.Where(sds => !col.Any(c => c.ExtractableDataSet_ID == sds.ExtractableDataSet_ID	648!
44	&& c.ExtractionConfiguration_ID == sds.ExtractionConfiguration_ID)).ToArray();	648✔
45	}
46
47
48	#region IDataExportPropertyManager
49
50	protected Dictionary<DataExportProperty, string> PropertiesDictionary = new();	288✔
51
52	public virtual string GetValue(DataExportProperty property) =>
53	PropertiesDictionary.TryGetValue(property, out var value) ? value : null;	2!
54
55	public virtual void SetValue(DataExportProperty property, string value)
56	{
57	PropertiesDictionary[property] = value;	2✔
58	}	2✔
59
60	#endregion
61
62
63	#region IExtractableDataSetPackageManager
64
65	protected Dictionary<IExtractableDataSetPackage, HashSet<IExtractableDataSet>> PackageDictionary { get; set; } =	72✔
66	new();	288✔
67
68	public IExtractableDataSet[] GetAllDataSets(IExtractableDataSetPackage package, IExtractableDataSet[] allDataSets)
69	{
70	if (!PackageDictionary.ContainsKey(package))	2✔
71	PackageDictionary.Add(package, new HashSet<IExtractableDataSet>());	2✔
72
73	return PackageDictionary[package].ToArray();	2✔
74	}
75
76	public virtual void AddDataSetToPackage(IExtractableDataSetPackage package, IExtractableDataSet dataSet)
77	{
78	if (!PackageDictionary.ContainsKey(package))	2✔
79	PackageDictionary.Add(package, new HashSet<IExtractableDataSet>());	2✔
80
81	PackageDictionary[package].Add(dataSet);	2✔
82	}	2✔
83
84	public virtual void RemoveDataSetFromPackage(IExtractableDataSetPackage package, IExtractableDataSet dataSet)
85	{
86	if (!PackageDictionary.ContainsKey(package))	×
87	PackageDictionary.Add(package, new HashSet<IExtractableDataSet>());	×
88
89	if (!PackageDictionary[package].Contains(dataSet))	×
90	throw new ArgumentException($"dataSet {dataSet} is not part of package {package} so cannot be removed",	×
91	nameof(dataSet));	×
92
93	PackageDictionary[package].Remove(dataSet);	×
94	}	×
95
96	public Dictionary<int, List<int>> GetPackageContentsDictionary()
97	{
98	return PackageDictionary.ToDictionary(k => k.Key.ID, v => v.Value.Select(o => o.ID).ToList());	18✔
99	}
100
101	public IEnumerable<ICumulativeExtractionResults> GetAllCumulativeExtractionResultsFor(
102	IExtractionConfiguration configuration, IExtractableDataSet dataset)
103	{
104	return GetAllObjects<CumulativeExtractionResults>().Where(e =>	×
105	e.ExtractionConfiguration_ID == configuration.ID && e.ExtractableDataSet_ID == dataset.ID);	×
106	}
107
108	public IReleaseLog GetReleaseLogEntryIfAny(CumulativeExtractionResults cumulativeExtractionResults) =>
109	GetAllObjectsWhere<ReleaseLog>("CumulativeExtractionResults_ID", cumulativeExtractionResults.ID)	×
110	.SingleOrDefault();	×
111
112	#endregion
113	}

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