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

0.0

/Rdmp.Core/DataViewing/ViewSelectedDatasetExtractionUICollection.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.Dashboarding;
using Rdmp.Core.DataExport.Data;
using Rdmp.Core.DataExport.DataExtraction.Commands;
using Rdmp.Core.DataExport.DataExtraction.UserPicks;
using Rdmp.Core.ReusableLibraryCode.DataAccess;

namespace Rdmp.Core.DataViewing;

internal class ViewSelectedDatasetExtractionUICollection : PersistableObjectCollection, IViewSQLAndResultsCollection
{
    private ExtractDatasetCommand _request;

    private ISelectedDataSets SelectedDataset => DatabaseObjects.OfType<ISelectedDataSets>().FirstOrDefault();

    public ViewSelectedDatasetExtractionUICollection()
    {
    }

    public ViewSelectedDatasetExtractionUICollection(ISelectedDataSets dataset) : this()
    {
        DatabaseObjects.Add(dataset);
    }

    public string GetSql()
    {
        BuildRequest();

        //get the SQL from the query builder
        return _request.QueryBuilder.SQL;
    }

    private void BuildRequest()
    {
        if (_request != null)
            return;

        var ec = SelectedDataset.ExtractionConfiguration;

        if (ec.Cohort_ID == null)
            throw new Exception("No cohort has been defined for this ExtractionConfiguration");

        //We are generating what the extraction SQL will be like, that only requires the dataset so empty bundle is fine
        _request = new ExtractDatasetCommand(ec, new ExtractableDatasetBundle(SelectedDataset.ExtractableDataSet));
        _request.GenerateQueryBuilder();
        _request.QueryBuilder.RegenerateSQL();
    }

    public IDataAccessPoint GetDataAccessPoint()
    {
        BuildRequest();

        return _request?.QueryBuilder?.TablesUsedInQuery?.FirstOrDefault();
    }

    public IEnumerable<DatabaseEntity> GetToolStripObjects()
    {
        yield return (DatabaseEntity)SelectedDataset;
    }

    public string GetTabName() => $"Extract {SelectedDataset}";

    public void AdjustAutocomplete(IAutoCompleteProvider autoComplete)
    {
    }

    public IQuerySyntaxHelper GetQuerySyntaxHelper()
    {
        BuildRequest();

        return _request.QueryBuilder.QuerySyntaxHelper;
    }
}

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.Dashboarding;
13	using Rdmp.Core.DataExport.Data;
14	using Rdmp.Core.DataExport.DataExtraction.Commands;
15	using Rdmp.Core.DataExport.DataExtraction.UserPicks;
16	using Rdmp.Core.ReusableLibraryCode.DataAccess;
17
18	namespace Rdmp.Core.DataViewing;
19
20	internal class ViewSelectedDatasetExtractionUICollection : PersistableObjectCollection, IViewSQLAndResultsCollection
21	{
22	private ExtractDatasetCommand _request;
23
24	private ISelectedDataSets SelectedDataset => DatabaseObjects.OfType<ISelectedDataSets>().FirstOrDefault();	×
25
26	public ViewSelectedDatasetExtractionUICollection()	×
27	{
28	}	×
29
30	public ViewSelectedDatasetExtractionUICollection(ISelectedDataSets dataset) : this()	×
31	{
32	DatabaseObjects.Add(dataset);	×
33	}	×
34
35	public string GetSql()
36	{
37	BuildRequest();	×
38
39	//get the SQL from the query builder
40	return _request.QueryBuilder.SQL;	×
41	}
42
43	private void BuildRequest()
44	{
45	if (_request != null)	×
46	return;	×
47
48	var ec = SelectedDataset.ExtractionConfiguration;	×
49
50	if (ec.Cohort_ID == null)	×
51	throw new Exception("No cohort has been defined for this ExtractionConfiguration");	×
52
53	//We are generating what the extraction SQL will be like, that only requires the dataset so empty bundle is fine
54	_request = new ExtractDatasetCommand(ec, new ExtractableDatasetBundle(SelectedDataset.ExtractableDataSet));	×
55	_request.GenerateQueryBuilder();	×
56	_request.QueryBuilder.RegenerateSQL();	×
57	}	×
58
59	public IDataAccessPoint GetDataAccessPoint()
60	{
61	BuildRequest();	×
62
63	return _request?.QueryBuilder?.TablesUsedInQuery?.FirstOrDefault();	×
64	}
65
66	public IEnumerable<DatabaseEntity> GetToolStripObjects()
67	{
68	yield return (DatabaseEntity)SelectedDataset;	×
69	}	×
70
71	public string GetTabName() => $"Extract {SelectedDataset}";	×
72
73	public void AdjustAutocomplete(IAutoCompleteProvider autoComplete)
74	{
75	}	×
76
77	public IQuerySyntaxHelper GetQuerySyntaxHelper()
78	{
79	BuildRequest();	×
80
81	return _request.QueryBuilder.QuerySyntaxHelper;	×
82	}
83	}

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