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

78.13

/Rdmp.Core/QueryBuilding/QueryBuilderArgs.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 Rdmp.Core.Curation.Data;
using Rdmp.Core.Curation.Data.Aggregation;
using Rdmp.Core.Curation.Data.Cohort.Joinables;

namespace Rdmp.Core.QueryBuilding;

/// <summary>
/// Input class for <see cref="CohortQueryBuilderHelper"/> that assists in building the Sql query for a single cohort set in a <see cref="AggregateConfiguration"/>
/// This can include arbitrary hacks like replacing the patient identifier with * and applying TopX etc (see base class <see cref="QueryBuilderCustomArgs"/>).
/// </summary>
public class QueryBuilderArgs : QueryBuilderCustomArgs
{
    public JoinableCohortAggregateConfigurationUse JoinIfAny { get; }
    public AggregateConfiguration JoinedTo { get; }
    public CohortQueryBuilderDependencySql JoinSql { get; }
    public ISqlParameter[] Globals { get; }

    /// <summary>
    /// Creates basic arguments for an <see cref="AggregateConfiguration"/> that does not have a join to a patient index table
    /// </summary>
    public QueryBuilderArgs(QueryBuilderCustomArgs customisations, ISqlParameter[] globals)
    {
        customisations?.Populate(this);
        Globals = globals ?? Array.Empty<ISqlParameter>();
    }

    /// <summary>
    /// Creates arguments for an <see cref="AggregateConfiguration"/> which has a JOIN to a patient index table.  All arguments must be provided
    /// </summary>
    /// <param name="join">The join usage relationship object (includes join direction etc)</param>
    /// <param name="joinedTo">The patient index to which the join is made to (e.g. <see cref="JoinableCohortAggregateConfiguration.AggregateConfiguration"/>)</param>
    /// <param name="joinSql">The full SQL of the join</param>
    /// <param name="customisations"></param>
    /// <param name="globals"></param>
    public QueryBuilderArgs(JoinableCohortAggregateConfigurationUse join, AggregateConfiguration joinedTo,
        CohortQueryBuilderDependencySql joinSql, QueryBuilderCustomArgs customisations,
        ISqlParameter[] globals) : this(customisations, globals)
    {
        JoinIfAny = join;
        JoinedTo = joinedTo;
        JoinSql = joinSql;

        if (JoinIfAny == null != (JoinedTo == null) || JoinIfAny == null != (JoinSql == null))
            throw new Exception("You must provide all arguments or no arguments");

        if (JoinedTo != null)
            if (!JoinedTo.IsCohortIdentificationAggregate || !JoinedTo.IsJoinablePatientIndexTable())
                throw new ArgumentException($"JoinedTo ({JoinedTo}) was not a patient index table", nameof(joinedTo));
    }
}

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 Rdmp.Core.Curation.Data;
9	using Rdmp.Core.Curation.Data.Aggregation;
10	using Rdmp.Core.Curation.Data.Cohort.Joinables;
11
12	namespace Rdmp.Core.QueryBuilding;
13
14	/// <summary>
15	/// Input class for <see cref="CohortQueryBuilderHelper"/> that assists in building the Sql query for a single cohort set in a <see cref="AggregateConfiguration"/>
16	/// This can include arbitrary hacks like replacing the patient identifier with * and applying TopX etc (see base class <see cref="QueryBuilderCustomArgs"/>).
17	/// </summary>
18	public class QueryBuilderArgs : QueryBuilderCustomArgs
19	{
20	public JoinableCohortAggregateConfigurationUse JoinIfAny { get; }	1,588✔
21	public AggregateConfiguration JoinedTo { get; }	1,292✔
22	public CohortQueryBuilderDependencySql JoinSql { get; }	1,174✔
23	public ISqlParameter[] Globals { get; }	528✔
24
25	/// <summary>
26	/// Creates basic arguments for an <see cref="AggregateConfiguration"/> that does not have a join to a patient index table
27	/// </summary>
28	public QueryBuilderArgs(QueryBuilderCustomArgs customisations, ISqlParameter[] globals)	528✔
29	{
30	customisations?.Populate(this);	528✔
31	Globals = globals ?? Array.Empty<ISqlParameter>();	528!
32	}	528✔
33
34	/// <summary>
35	/// Creates arguments for an <see cref="AggregateConfiguration"/> which has a JOIN to a patient index table. All arguments must be provided
36	/// </summary>
37	/// <param name="join">The join usage relationship object (includes join direction etc)</param>
38	/// <param name="joinedTo">The patient index to which the join is made to (e.g. <see cref="JoinableCohortAggregateConfiguration.AggregateConfiguration"/>)</param>
39	/// <param name="joinSql">The full SQL of the join</param>
40	/// <param name="customisations"></param>
41	/// <param name="globals"></param>
42	public QueryBuilderArgs(JoinableCohortAggregateConfigurationUse join, AggregateConfiguration joinedTo,
43	CohortQueryBuilderDependencySql joinSql, QueryBuilderCustomArgs customisations,
44	ISqlParameter[] globals) : this(customisations, globals)	414✔
45	{
46	JoinIfAny = join;	414✔
47	JoinedTo = joinedTo;	414✔
48	JoinSql = joinSql;	414✔
49
50	if (JoinIfAny == null != (JoinedTo == null) \|\| JoinIfAny == null != (JoinSql == null))	414!
51	throw new Exception("You must provide all arguments or no arguments");	×
52
53	if (JoinedTo != null)	414✔
54	if (!JoinedTo.IsCohortIdentificationAggregate \|\| !JoinedTo.IsJoinablePatientIndexTable())	116!
55	throw new ArgumentException($"JoinedTo ({JoinedTo}) was not a patient index table", nameof(joinedTo));	×
56	}	414✔
57	}

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