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

10.91

/Rdmp.Core/DataViewing/ViewAggregateExtractUICollection.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 FAnsi.Discovery.QuerySyntax;
using Rdmp.Core.Curation.Data;
using Rdmp.Core.Curation.Data.Aggregation;
using Rdmp.Core.Curation.Data.Dashboarding;
using Rdmp.Core.QueryBuilding;
using Rdmp.Core.ReusableLibraryCode.DataAccess;

namespace Rdmp.Core.DataViewing;

/// <summary>
/// Builds a query based on a <see cref="AggregateConfiguration"/> (either a sample of data in a graph or matching a cohort
/// (<see cref="AggregateConfiguration.IsCohortIdentificationAggregate"/>)
/// </summary>
public class ViewAggregateExtractUICollection : PersistableObjectCollection, IViewSQLAndResultsCollection
{
    public bool UseQueryCache { get; set; }

    /// <summary>
    /// How big should the sample be
    /// </summary>
    public int? TopX { get; set; } = 100;

    public ViewAggregateExtractUICollection()
    {
    }

    public ViewAggregateExtractUICollection(AggregateConfiguration config) : this()
    {
        DatabaseObjects.Add(config);
    }

    public IEnumerable<DatabaseEntity> GetToolStripObjects()
    {
        if (!UseQueryCache) yield break;
        var cache = GetCacheServer();
        if (cache != null)
            yield return cache;
    }

    private ExternalDatabaseServer GetCacheServer()
    {
        var cic = AggregateConfiguration.GetCohortIdentificationConfigurationIfAny();
        return cic is { QueryCachingServer_ID: not null } ? cic.QueryCachingServer : null;
    }

    public IDataAccessPoint GetDataAccessPoint()
    {
        var dim = AggregateConfiguration.AggregateDimensions.FirstOrDefault();

        //the aggregate has no dimensions
        if (dim != null) return dim.ColumnInfo.TableInfo;
        var table = AggregateConfiguration.ForcedJoins.FirstOrDefault() ?? throw new Exception(
            $"AggregateConfiguration '{AggregateConfiguration}' has no AggregateDimensions and no TableInfo forced joins, we do not know where/what table to run the query on");
        return table;
    }

    public string GetSql()
    {
        var ac = AggregateConfiguration;

        if (!ac.IsCohortIdentificationAggregate) return ac.GetQueryBuilder().SQL;

        var cic = ac.GetCohortIdentificationConfigurationIfAny();
        var globals = cic.GetAllParameters();

        var builder = new CohortQueryBuilder(ac, globals, null);

        if (UseQueryCache)
            builder.CacheServer = GetCacheServer();

        return TopX.HasValue ? builder.GetDatasetSampleSQL(TopX.Value) : builder.SQL;
    }

    public string GetTabName() => $"View Top 100 {AggregateConfiguration}";

    public void AdjustAutocomplete(IAutoCompleteProvider autoComplete)
    {
        if (AggregateConfiguration != null)
            autoComplete.Add(AggregateConfiguration);
    }

    private AggregateConfiguration AggregateConfiguration =>
        DatabaseObjects.OfType<AggregateConfiguration>().SingleOrDefault();

    public IQuerySyntaxHelper GetQuerySyntaxHelper() => AggregateConfiguration?.GetQuerySyntaxHelper();
}

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 FAnsi.Discovery.QuerySyntax;
11	using Rdmp.Core.Curation.Data;
12	using Rdmp.Core.Curation.Data.Aggregation;
13	using Rdmp.Core.Curation.Data.Dashboarding;
14	using Rdmp.Core.QueryBuilding;
15	using Rdmp.Core.ReusableLibraryCode.DataAccess;
16
17	namespace Rdmp.Core.DataViewing;
18
19	/// <summary>
20	/// Builds a query based on a <see cref="AggregateConfiguration"/> (either a sample of data in a graph or matching a cohort
21	/// (<see cref="AggregateConfiguration.IsCohortIdentificationAggregate"/>)
22	/// </summary>
23	public class ViewAggregateExtractUICollection : PersistableObjectCollection, IViewSQLAndResultsCollection
24	{
25	public bool UseQueryCache { get; set; }	×
26
27	/// <summary>
28	/// How big should the sample be
29	/// </summary>
30	public int? TopX { get; set; } = 100;	20✔
31
32	public ViewAggregateExtractUICollection()	10✔
33	{
34	}	10✔
35
36	public ViewAggregateExtractUICollection(AggregateConfiguration config) : this()	10✔
37	{
38	DatabaseObjects.Add(config);	10✔
39	}	10✔
40
41	public IEnumerable<DatabaseEntity> GetToolStripObjects()
42	{
43	if (!UseQueryCache) yield break;	×
44	var cache = GetCacheServer();	×
45	if (cache != null)	×
46	yield return cache;	×
47	}	×
48
49	private ExternalDatabaseServer GetCacheServer()
50	{
51	var cic = AggregateConfiguration.GetCohortIdentificationConfigurationIfAny();	×
52	return cic is { QueryCachingServer_ID: not null } ? cic.QueryCachingServer : null;	×
53	}
54
55	public IDataAccessPoint GetDataAccessPoint()
56	{
57	var dim = AggregateConfiguration.AggregateDimensions.FirstOrDefault();	×
58
59	//the aggregate has no dimensions
60	if (dim != null) return dim.ColumnInfo.TableInfo;	×
61	var table = AggregateConfiguration.ForcedJoins.FirstOrDefault() ?? throw new Exception(	×
62	$"AggregateConfiguration '{AggregateConfiguration}' has no AggregateDimensions and no TableInfo forced joins, we do not know where/what table to run the query on");	×
63	return table;	×
64	}
65
66	public string GetSql()
67	{
68	var ac = AggregateConfiguration;	×
69
70	if (!ac.IsCohortIdentificationAggregate) return ac.GetQueryBuilder().SQL;	×
71
72	var cic = ac.GetCohortIdentificationConfigurationIfAny();	×
73	var globals = cic.GetAllParameters();	×
74
75	var builder = new CohortQueryBuilder(ac, globals, null);	×
76
77	if (UseQueryCache)	×
78	builder.CacheServer = GetCacheServer();	×
79
80	return TopX.HasValue ? builder.GetDatasetSampleSQL(TopX.Value) : builder.SQL;	×
81	}
82
83	public string GetTabName() => $"View Top 100 {AggregateConfiguration}";	×
84
85	public void AdjustAutocomplete(IAutoCompleteProvider autoComplete)
86	{
87	if (AggregateConfiguration != null)	×
88	autoComplete.Add(AggregateConfiguration);	×
89	}	×
90
91	private AggregateConfiguration AggregateConfiguration =>
92	DatabaseObjects.OfType<AggregateConfiguration>().SingleOrDefault();	×
93
94	public IQuerySyntaxHelper GetQuerySyntaxHelper() => AggregateConfiguration?.GetQuerySyntaxHelper();	×
95	}

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