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

48.57

/Rdmp.Core/Providers/Nodes/JoinableCollectionNode.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 Rdmp.Core.Curation.Data.Cohort;
using Rdmp.Core.Curation.Data.Cohort.Joinables;
using Rdmp.Core.MapsDirectlyToDatabaseTable;
using Rdmp.Core.ReusableLibraryCode.DataAccess;

namespace Rdmp.Core.Providers.Nodes;

/// <summary>
/// Collection of queries which can be joined against when building cohorts (e.g. to find all hospital admissions within 6
/// months of a prescription for drug X).  See <see cref="JoinableCohortAggregateConfiguration"/>.
/// </summary>
public class JoinableCollectionNode : Node, IOrderable
{
    public CohortIdentificationConfiguration Configuration { get; }
    public JoinableCohortAggregateConfiguration[] Joinables { get; }

    public JoinableCollectionNode(CohortIdentificationConfiguration configuration,
        JoinableCohortAggregateConfiguration[] joinables)
    {
        Configuration = configuration;
        Joinables = joinables;
    }

    public static string GetCatalogueName() => "";

    public static IMapsDirectlyToDatabaseTable Child => null;

    public static IDataAccessPoint[] GetDataAccessPoints() => null;

    public override string ToString() => "Patient Index Table(s)";

    public static string FinalRowCount() => "";
    public int? CumulativeRowCount { set; get; }


    public static string GetStateDescription() => "";

    public static string Order() => "";

    public string ElapsedTime = "";

    public static string GetCachedQueryUseCount() => "";

    public static string DescribePurpose() =>
        @"Drop Aggregates (datasets) here to create patient index tables (Tables with interesting
patient specific dates/fields which you need to use in other datasets). For example if you are
interested in studying hospitalisations for condition X and all other patient identification 
criteria are 'in the 6 months' / 'in the 12 months' post hospitalisation date per patient)";

    protected bool Equals(JoinableCollectionNode other) => Equals(Configuration, other.Configuration);

    public override bool Equals(object obj)
    {
        if (obj is null) return false;
        if (ReferenceEquals(this, obj)) return true;
        if (obj.GetType() != GetType()) return false;
        return Equals((JoinableCollectionNode)obj);
    }

    public override int GetHashCode() => System.HashCode.Combine(Configuration, GetType());

    int IOrderable.Order
    {
        get => 9999;
        set { }
    }
}

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 Rdmp.Core.Curation.Data.Cohort;
8	using Rdmp.Core.Curation.Data.Cohort.Joinables;
9	using Rdmp.Core.MapsDirectlyToDatabaseTable;
10	using Rdmp.Core.ReusableLibraryCode.DataAccess;
11
12	namespace Rdmp.Core.Providers.Nodes;
13
14	/// <summary>
15	/// Collection of queries which can be joined against when building cohorts (e.g. to find all hospital admissions within 6
16	/// months of a prescription for drug X). See <see cref="JoinableCohortAggregateConfiguration"/>.
17	/// </summary>
18	public class JoinableCollectionNode : Node, IOrderable
19	{
20	public CohortIdentificationConfiguration Configuration { get; }	5,456✔
21	public JoinableCohortAggregateConfiguration[] Joinables { get; }	1,698✔
22
23	public JoinableCollectionNode(CohortIdentificationConfiguration configuration,	1,698✔
24	JoinableCohortAggregateConfiguration[] joinables)	1,698✔
25	{
26	Configuration = configuration;	1,698✔
27	Joinables = joinables;	1,698✔
28	}	1,698✔
29
30	public static string GetCatalogueName() => "";	×
31
32	public static IMapsDirectlyToDatabaseTable Child => null;	×
33
34	public static IDataAccessPoint[] GetDataAccessPoints() => null;	×
35
36	public override string ToString() => "Patient Index Table(s)";	14✔
37
38	public static string FinalRowCount() => "";	×
39	public int? CumulativeRowCount { set; get; }	×
40
41
42	public static string GetStateDescription() => "";	×
43
44	public static string Order() => "";	×
45
46	public string ElapsedTime = "";	1,698✔
47
48	public static string GetCachedQueryUseCount() => "";	×
49
50	public static string DescribePurpose() =>
51	@"Drop Aggregates (datasets) here to create patient index tables (Tables with interesting	×
52	patient specific dates/fields which you need to use in other datasets). For example if you are	×
53	interested in studying hospitalisations for condition X and all other patient identification	×
54	criteria are 'in the 6 months' / 'in the 12 months' post hospitalisation date per patient)";	×
55
56	protected bool Equals(JoinableCollectionNode other) => Equals(Configuration, other.Configuration);	×
57
58	public override bool Equals(object obj)
59	{
60	if (obj is null) return false;	1,686!
61	if (ReferenceEquals(this, obj)) return true;	1,806✔
62	if (obj.GetType() != GetType()) return false;	3,132!
63	return Equals((JoinableCollectionNode)obj);	×
64	}
65
66	public override int GetHashCode() => System.HashCode.Combine(Configuration, GetType());	5,456✔
67
68	int IOrderable.Order
69	{
70	get => 9999;	×
71	set { }	×
72	}
73	}

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