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/CommandExecution/AtomicCommands/ExecuteCommandAddCohortToExtractionConfiguration.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.Linq;
using Rdmp.Core.CommandExecution.Combining;
using Rdmp.Core.DataExport.Data;
using Rdmp.Core.Repositories.Construction;

namespace Rdmp.Core.CommandExecution.AtomicCommands;

public class ExecuteCommandAddCohortToExtractionConfiguration : BasicCommandExecution
{
    private readonly ExtractableCohortCombineable _sourceExtractableCohortComand;
    private readonly ExtractionConfiguration _targetExtractionConfiguration;

    [UseWithObjectConstructor]
    public ExecuteCommandAddCohortToExtractionConfiguration(IBasicActivateItems activator, ExtractableCohort cohort,
        ExtractionConfiguration targetExtractionConfiguration)
        : this(activator, new ExtractableCohortCombineable(cohort), targetExtractionConfiguration)
    {
    }

    public ExecuteCommandAddCohortToExtractionConfiguration(IBasicActivateItems activator,
        ExtractableCohortCombineable sourceExtractableCohortComand,
        ExtractionConfiguration targetExtractionConfiguration) : base(activator)
    {
        _sourceExtractableCohortComand = sourceExtractableCohortComand;
        _targetExtractionConfiguration = targetExtractionConfiguration;

        if (_sourceExtractableCohortComand.Cohort.IsDeprecated)
        {
            SetImpossible("Cohort is deprecated");
            return;
        }

        if (_sourceExtractableCohortComand.ErrorGettingCohortData != null)
        {
            SetImpossible(
                $"Could not fetch Cohort data:{_sourceExtractableCohortComand.ErrorGettingCohortData.Message}");
            return;
        }

        if (_targetExtractionConfiguration.IsReleased)
        {
            SetImpossible("Extraction is Frozen because it has been released and is readonly, try cloning it instead");
            return;
        }

        if (!sourceExtractableCohortComand.CompatibleExtractionConfigurations.Contains(_targetExtractionConfiguration))
        {
            SetImpossible(
                $"Cohort has project number {sourceExtractableCohortComand.ExternalProjectNumber} so can only be added to ExtractionConfigurations belonging to Projects with that same number");
            return;
        }

        if (_targetExtractionConfiguration.Cohort_ID != null)
        {
            if (_targetExtractionConfiguration.Cohort_ID == sourceExtractableCohortComand.Cohort.ID)
                SetImpossible("ExtractionConfiguration already uses this cohort");
            else
                SetImpossible(
                    "ExtractionConfiguration already uses a different cohort (delete the relationship to the old cohort first)");

            return;
        }
    }

    public override void Execute()
    {
        base.Execute();

        _targetExtractionConfiguration.Cohort_ID = _sourceExtractableCohortComand.Cohort.ID;
        _targetExtractionConfiguration.SaveToDatabase();
        Publish(_targetExtractionConfiguration);
    }
}

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.Linq;
8	using Rdmp.Core.CommandExecution.Combining;
9	using Rdmp.Core.DataExport.Data;
10	using Rdmp.Core.Repositories.Construction;
11
12	namespace Rdmp.Core.CommandExecution.AtomicCommands;
13
14	public class ExecuteCommandAddCohortToExtractionConfiguration : BasicCommandExecution
15	{
16	private readonly ExtractableCohortCombineable _sourceExtractableCohortComand;
17	private readonly ExtractionConfiguration _targetExtractionConfiguration;
18
19	[UseWithObjectConstructor]
20	public ExecuteCommandAddCohortToExtractionConfiguration(IBasicActivateItems activator, ExtractableCohort cohort,
21	ExtractionConfiguration targetExtractionConfiguration)
22	: this(activator, new ExtractableCohortCombineable(cohort), targetExtractionConfiguration)	×
23	{
24	}	×
25
26	public ExecuteCommandAddCohortToExtractionConfiguration(IBasicActivateItems activator,
27	ExtractableCohortCombineable sourceExtractableCohortComand,
28	ExtractionConfiguration targetExtractionConfiguration) : base(activator)	×
29	{
30	_sourceExtractableCohortComand = sourceExtractableCohortComand;	×
31	_targetExtractionConfiguration = targetExtractionConfiguration;	×
32
33	if (_sourceExtractableCohortComand.Cohort.IsDeprecated)	×
34	{
35	SetImpossible("Cohort is deprecated");	×
36	return;	×
37	}
38
39	if (_sourceExtractableCohortComand.ErrorGettingCohortData != null)	×
40	{
41	SetImpossible(	×
42	$"Could not fetch Cohort data:{_sourceExtractableCohortComand.ErrorGettingCohortData.Message}");	×
43	return;	×
44	}
45
46	if (_targetExtractionConfiguration.IsReleased)	×
47	{
48	SetImpossible("Extraction is Frozen because it has been released and is readonly, try cloning it instead");	×
49	return;	×
50	}
51
52	if (!sourceExtractableCohortComand.CompatibleExtractionConfigurations.Contains(_targetExtractionConfiguration))	×
53	{
54	SetImpossible(	×
55	$"Cohort has project number {sourceExtractableCohortComand.ExternalProjectNumber} so can only be added to ExtractionConfigurations belonging to Projects with that same number");	×
56	return;	×
57	}
58
59	if (_targetExtractionConfiguration.Cohort_ID != null)	×
60	{
61	if (_targetExtractionConfiguration.Cohort_ID == sourceExtractableCohortComand.Cohort.ID)	×
62	SetImpossible("ExtractionConfiguration already uses this cohort");	×
63	else
64	SetImpossible(	×
65	"ExtractionConfiguration already uses a different cohort (delete the relationship to the old cohort first)");	×
66
67	return;	×
68	}
69	}	×
70
71	public override void Execute()
72	{
73	base.Execute();	×
74
75	_targetExtractionConfiguration.Cohort_ID = _sourceExtractableCohortComand.Cohort.ID;	×
76	_targetExtractionConfiguration.SaveToDatabase();	×
77	Publish(_targetExtractionConfiguration);	×
78	}	×
79	}

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