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/Data/SelectedDataSetsForcedJoin.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.Data.Common;
using Rdmp.Core.Curation.Data;
using Rdmp.Core.MapsDirectlyToDatabaseTable;
using Rdmp.Core.MapsDirectlyToDatabaseTable.Injection;
using Rdmp.Core.Repositories;

namespace Rdmp.Core.DataExport.Data;

/// <inheritdoc cref="ISelectedDataSetsForcedJoin"/>
public class SelectedDataSetsForcedJoin : DatabaseEntity, ISelectedDataSetsForcedJoin, IInjectKnown<TableInfo>
{
    #region Database Properties

    private int _selectedDataSets_ID;
    private int _tableInfo_ID;
    private Lazy<TableInfo> _knownTableInfo;

    #endregion

    /// <inheritdoc/>
    public int SelectedDataSets_ID
    {
        get => _selectedDataSets_ID;
        set => SetField(ref _selectedDataSets_ID, value);
    }

    /// <inheritdoc/>
    public int TableInfo_ID
    {
        get => _tableInfo_ID;
        set => SetField(ref _tableInfo_ID, value);
    }

    #region Relationships

    /// <inheritdoc cref="TableInfo_ID"/>
    [NoMappingToDatabase]
    public TableInfo TableInfo => _knownTableInfo.Value;

    #endregion


    public SelectedDataSetsForcedJoin()
    {
        ClearAllInjections();
    }

    /// <summary>
    /// Creates a new declaration in the <paramref name="repository"/> database that the given <paramref name="tableInfo"/> should
    /// always be joined against when extract the <paramref name="sds"/>.
    /// </summary>
    /// <param name="repository"></param>
    /// <param name="sds"></param>
    /// <param name="tableInfo"></param>
    public SelectedDataSetsForcedJoin(IDataExportRepository repository, SelectedDataSets sds, ITableInfo tableInfo)
    {
        repository.InsertAndHydrate(this, new Dictionary<string, object>
        {
            { "SelectedDataSets_ID", sds.ID },
            { "TableInfo_ID", tableInfo.ID }
        });

        if (ID == 0 || Repository != repository)
            throw new ArgumentException("Repository failed to properly hydrate this class");

        ClearAllInjections();
    }

    internal SelectedDataSetsForcedJoin(IRepository repository, DbDataReader r) : base(repository, r)
    {
        SelectedDataSets_ID = Convert.ToInt32(r["SelectedDataSets_ID"]);
        TableInfo_ID = Convert.ToInt32(r["TableInfo_ID"]);

        ClearAllInjections();
    }

    /// <inheritdoc/>
    public void InjectKnown(TableInfo instance)
    {
        _knownTableInfo = new Lazy<TableInfo>(instance);
    }

    /// <inheritdoc/>
    public void ClearAllInjections()
    {
        _knownTableInfo = new Lazy<TableInfo>(FetchTableInfo);
    }

    private TableInfo FetchTableInfo() =>
        ((IDataExportRepository)Repository).CatalogueRepository.GetObjectByID<TableInfo>(TableInfo_ID);
}

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.Data.Common;
10	using Rdmp.Core.Curation.Data;
11	using Rdmp.Core.MapsDirectlyToDatabaseTable;
12	using Rdmp.Core.MapsDirectlyToDatabaseTable.Injection;
13	using Rdmp.Core.Repositories;
14
15	namespace Rdmp.Core.DataExport.Data;
16
17	/// <inheritdoc cref="ISelectedDataSetsForcedJoin"/>
18	public class SelectedDataSetsForcedJoin : DatabaseEntity, ISelectedDataSetsForcedJoin, IInjectKnown<TableInfo>
19	{
20	#region Database Properties
21
22	private int _selectedDataSets_ID;
23	private int _tableInfo_ID;
24	private Lazy<TableInfo> _knownTableInfo;
25
26	#endregion
27
28	/// <inheritdoc/>
29	public int SelectedDataSets_ID
30	{
31	get => _selectedDataSets_ID;	4✔
32	set => SetField(ref _selectedDataSets_ID, value);	14✔
33	}
34
35	/// <inheritdoc/>
36	public int TableInfo_ID
37	{
38	get => _tableInfo_ID;	6✔
39	set => SetField(ref _tableInfo_ID, value);	14✔
40	}
41
42	#region Relationships
43
44	/// <inheritdoc cref="TableInfo_ID"/>
45	[NoMappingToDatabase]
46	public TableInfo TableInfo => _knownTableInfo.Value;	4✔
47
48	#endregion
49
50
51	public SelectedDataSetsForcedJoin()	×
52	{
53	ClearAllInjections();	×
54	}	×
55
56	/// <summary>
57	/// Creates a new declaration in the <paramref name="repository"/> database that the given <paramref name="tableInfo"/> should
58	/// always be joined against when extract the <paramref name="sds"/>.
59	/// </summary>
60	/// <param name="repository"></param>
61	/// <param name="sds"></param>
62	/// <param name="tableInfo"></param>
63	public SelectedDataSetsForcedJoin(IDataExportRepository repository, SelectedDataSets sds, ITableInfo tableInfo)	10✔
64	{
65	repository.InsertAndHydrate(this, new Dictionary<string, object>	10✔
66	{	10✔
67	{ "SelectedDataSets_ID", sds.ID },	10✔
68	{ "TableInfo_ID", tableInfo.ID }	10✔
69	});	10✔
70
71	if (ID == 0 \|\| Repository != repository)	10!
72	throw new ArgumentException("Repository failed to properly hydrate this class");	×
73
74	ClearAllInjections();	10✔
75	}	10✔
76
77	internal SelectedDataSetsForcedJoin(IRepository repository, DbDataReader r) : base(repository, r)	4✔
78	{
79	SelectedDataSets_ID = Convert.ToInt32(r["SelectedDataSets_ID"]);	4✔
80	TableInfo_ID = Convert.ToInt32(r["TableInfo_ID"]);	4✔
81
82	ClearAllInjections();	4✔
83	}	4✔
84
85	/// <inheritdoc/>
86	public void InjectKnown(TableInfo instance)
87	{
88	_knownTableInfo = new Lazy<TableInfo>(instance);	×
89	}	×
90
91	/// <inheritdoc/>
92	public void ClearAllInjections()
93	{
94	_knownTableInfo = new Lazy<TableInfo>(FetchTableInfo);	14✔
95	}	14✔
96
97	private TableInfo FetchTableInfo() =>
98	((IDataExportRepository)Repository).CatalogueRepository.GetObjectByID<TableInfo>(TableInfo_ID);	4✔
99	}

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