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/CommandLine/DatabaseCreation/PlatformDatabaseCreationRepositoryFinder.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 Rdmp.Core.MapsDirectlyToDatabaseTable;
using Rdmp.Core.Repositories;
using Rdmp.Core.Startup;

namespace Rdmp.Core.CommandLine.DatabaseCreation;

/// <summary>
/// IRDMPPlatformRepositoryServiceLocator which identifies the location of Catalogue and Data Export databases during the runtime of DatabaseCreation.exe
/// 
/// <para>Since these connection strings are part of the command line arguments to DatabaseCreation.exe it's a pretty simple class!</para>
/// </summary>
public class PlatformDatabaseCreationRepositoryFinder : IRDMPPlatformRepositoryServiceLocator
{
    private readonly LinkedRepositoryProvider _linkedRepositoryProvider;

    public ICatalogueRepository CatalogueRepository => _linkedRepositoryProvider.CatalogueRepository;

    public IDataExportRepository DataExportRepository => _linkedRepositoryProvider.DataExportRepository;

    public IMapsDirectlyToDatabaseTable GetArbitraryDatabaseObject(string repositoryTypeName,
        string databaseObjectTypeName, int objectID) =>
        _linkedRepositoryProvider.GetArbitraryDatabaseObject(repositoryTypeName, databaseObjectTypeName, objectID);

    public bool ArbitraryDatabaseObjectExists(string repositoryTypeName, string databaseObjectTypeName, int objectID) =>
        _linkedRepositoryProvider.ArbitraryDatabaseObjectExists(repositoryTypeName, databaseObjectTypeName, objectID);

    /// <inheritdoc/>
    public IMapsDirectlyToDatabaseTable GetObjectByID<T>(int value) where T : IMapsDirectlyToDatabaseTable =>
        _linkedRepositoryProvider.GetObjectByID<T>(value);

    public IMapsDirectlyToDatabaseTable GetObjectByID(Type t, int value) =>
        _linkedRepositoryProvider.GetObjectByID(t, value);

    public IEnumerable<IRepository> GetAllRepositories() => _linkedRepositoryProvider.GetAllRepositories();

    public PlatformDatabaseCreationRepositoryFinder(PlatformDatabaseCreationOptions options)
    {
        var cata = options.GetBuilder(PlatformDatabaseCreation.DefaultCatalogueDatabaseName);
        var export = options.GetBuilder(PlatformDatabaseCreation.DefaultDataExportDatabaseName);

        _linkedRepositoryProvider = new LinkedRepositoryProvider(cata.ConnectionString, export.ConnectionString);
    }
}

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 Rdmp.Core.MapsDirectlyToDatabaseTable;
10	using Rdmp.Core.Repositories;
11	using Rdmp.Core.Startup;
12
13	namespace Rdmp.Core.CommandLine.DatabaseCreation;
14
15	/// <summary>
16	/// IRDMPPlatformRepositoryServiceLocator which identifies the location of Catalogue and Data Export databases during the runtime of DatabaseCreation.exe
17	///
18	/// <para>Since these connection strings are part of the command line arguments to DatabaseCreation.exe it's a pretty simple class!</para>
19	/// </summary>
20	public class PlatformDatabaseCreationRepositoryFinder : IRDMPPlatformRepositoryServiceLocator
21	{
22	private readonly LinkedRepositoryProvider _linkedRepositoryProvider;
23
24	public ICatalogueRepository CatalogueRepository => _linkedRepositoryProvider.CatalogueRepository;	15,538✔
25
26	public IDataExportRepository DataExportRepository => _linkedRepositoryProvider.DataExportRepository;	2,650✔
27
28	public IMapsDirectlyToDatabaseTable GetArbitraryDatabaseObject(string repositoryTypeName,
29	string databaseObjectTypeName, int objectID) =>
30	_linkedRepositoryProvider.GetArbitraryDatabaseObject(repositoryTypeName, databaseObjectTypeName, objectID);	68✔
31
32	public bool ArbitraryDatabaseObjectExists(string repositoryTypeName, string databaseObjectTypeName, int objectID) =>
33	_linkedRepositoryProvider.ArbitraryDatabaseObjectExists(repositoryTypeName, databaseObjectTypeName, objectID);	×
34
35	/// <inheritdoc/>
36	public IMapsDirectlyToDatabaseTable GetObjectByID<T>(int value) where T : IMapsDirectlyToDatabaseTable =>
37	_linkedRepositoryProvider.GetObjectByID<T>(value);	×
38
39	public IMapsDirectlyToDatabaseTable GetObjectByID(Type t, int value) =>
40	_linkedRepositoryProvider.GetObjectByID(t, value);	×
41
42	public IEnumerable<IRepository> GetAllRepositories() => _linkedRepositoryProvider.GetAllRepositories();	62✔
43
44	public PlatformDatabaseCreationRepositoryFinder(PlatformDatabaseCreationOptions options)	346✔
45	{
46	var cata = options.GetBuilder(PlatformDatabaseCreation.DefaultCatalogueDatabaseName);	346✔
47	var export = options.GetBuilder(PlatformDatabaseCreation.DefaultDataExportDatabaseName);	346✔
48
49	_linkedRepositoryProvider = new LinkedRepositoryProvider(cata.ConnectionString, export.ConnectionString);	346✔
50	}	346✔
51	}

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