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

67.31

/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewFilterContainer.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;
using Rdmp.Core.Curation.Data;
using Rdmp.Core.Curation.Data.Aggregation;
using Rdmp.Core.Icons.IconProvision;
using Rdmp.Core.MapsDirectlyToDatabaseTable;
using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats;

namespace Rdmp.Core.CommandExecution.AtomicCommands;

public sealed class ExecuteCommandAddNewFilterContainer : BasicCommandExecution
{
    private readonly IRootFilterContainerHost _host;
    private readonly IContainer _container;
    internal const string FiltersCannotBeAddedToApiCalls = "Filters cannot be added to API calls";
    private const float DefaultWeight = 1.1f;

    public ExecuteCommandAddNewFilterContainer(IBasicActivateItems activator, IRootFilterContainerHost host) :
        base(activator)
    {
        Weight = DefaultWeight;
        _host = host;

        if (host.RootFilterContainer_ID != null)
            SetImpossible("There is already a root filter container on this object");

        if (host is AggregateConfiguration ac)
        {
            if (ac.OverrideFiltersByUsingParentAggregateConfigurationInstead_ID != null)
                SetImpossible("Aggregate is set to use another's filter container tree");

            if (ac.Catalogue.IsApiCall())
                SetImpossible(FiltersCannotBeAddedToApiCalls);
        }

        SetImpossibleIfReadonly(host);
    }

    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
        iconProvider.GetImage(RDMPConcept.FilterContainer, OverlayKind.Add);

    public ExecuteCommandAddNewFilterContainer(IBasicActivateItems activator, IContainer container) : base(activator)
    {
        _container = container;

        SetImpossibleIfReadonly(container);
    }

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

        var factory = (_container?.GetFilterFactory() ?? _host?.GetFilterFactory()) ??
                      throw new Exception("Unable to determine FilterFactory, is host and container null?");
        var newContainer = factory.CreateNewContainer();

        if (_host != null)
        {
            _host.RootFilterContainer_ID = newContainer.ID;
            _host.SaveToDatabase();
        }
        else
        {
            if (_container == null)
                throw new Exception("Command should take container or host but both were null");

            _container.AddChild(newContainer);
        }


        Publish(_host ?? (IMapsDirectlyToDatabaseTable)newContainer);
        Emphasise(newContainer);
    }
}

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;
9	using Rdmp.Core.Curation.Data;
10	using Rdmp.Core.Curation.Data.Aggregation;
11	using Rdmp.Core.Icons.IconProvision;
12	using Rdmp.Core.MapsDirectlyToDatabaseTable;
13	using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision;
14	using SixLabors.ImageSharp;
15	using SixLabors.ImageSharp.PixelFormats;
16
17	namespace Rdmp.Core.CommandExecution.AtomicCommands;
18
19	public sealed class ExecuteCommandAddNewFilterContainer : BasicCommandExecution
20	{
21	private readonly IRootFilterContainerHost _host;
22	private readonly IContainer _container;
23	internal const string FiltersCannotBeAddedToApiCalls = "Filters cannot be added to API calls";
24	private const float DefaultWeight = 1.1f;
25
26	public ExecuteCommandAddNewFilterContainer(IBasicActivateItems activator, IRootFilterContainerHost host) :
27	base(activator)	6✔
28	{
29	Weight = DefaultWeight;	6✔
30	_host = host;	6✔
31
32	if (host.RootFilterContainer_ID != null)	6✔
33	SetImpossible("There is already a root filter container on this object");	2✔
34
35	if (host is AggregateConfiguration ac)	6✔
36	{
37	if (ac.OverrideFiltersByUsingParentAggregateConfigurationInstead_ID != null)	6!
38	SetImpossible("Aggregate is set to use another's filter container tree");	×
39
40	if (ac.Catalogue.IsApiCall())	6✔
41	SetImpossible(FiltersCannotBeAddedToApiCalls);	2✔
42	}
43
44	SetImpossibleIfReadonly(host);	6✔
45	}	6✔
46
47	public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
48	iconProvider.GetImage(RDMPConcept.FilterContainer, OverlayKind.Add);	×
49
50	public ExecuteCommandAddNewFilterContainer(IBasicActivateItems activator, IContainer container) : base(activator)	×
51	{
52	_container = container;	×
53
54	SetImpossibleIfReadonly(container);	×
55	}	×
56
57	public override void Execute()
58	{
59	base.Execute();	2✔
60
61	var factory = (_container?.GetFilterFactory() ?? _host?.GetFilterFactory()) ??	2!
62	throw new Exception("Unable to determine FilterFactory, is host and container null?");	2✔
63	var newContainer = factory.CreateNewContainer();	2✔
64
65	if (_host != null)	2!
66	{
67	_host.RootFilterContainer_ID = newContainer.ID;	2✔
68	_host.SaveToDatabase();	2✔
69	}
70	else
71	{
72	if (_container == null)	×
73	throw new Exception("Command should take container or host but both were null");	×
74
75	_container.AddChild(newContainer);	×
76	}
77
78
79	Publish(_host ?? (IMapsDirectlyToDatabaseTable)newContainer);	2!
80	Emphasise(newContainer);	2✔
81	}	2✔
82	}

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