13493861722

Committed 24 Feb 2025 08:35AM UTC coverage: 57.414% (-0.03%) from 57.446%

Build # 13493861722

Build Type

push

github

Committed by

web-flow

Commit Message

marge v8.4.3 into main (#2145)

* simple db update

* add changelog

* revert csproj

* Fix up some codeql/inspection code issues (#2087)

* Update OverviewModel.cs

Fix up some .Dispose/using issues, make finding most recent load ID more efficient

* LINQ tidying

* CodeQL fixups

* Update Catalogue.cs

Add Hashcode, Equals methods.

* Update Catalogue.cs

Tweak equality semantics for RDMP DB oddities

* Bump actions/setup-dotnet from 4.1.0 to 4.2.0

Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/actions/setup-dotnet/releases)
- [Commits](https://github.com/actions/setup-dotnet/compare/v4.1.0...v4.2.0)

---
updated-dependencies:
- dependency-name: actions/setup-dotnet
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump NUnit.Analyzers from 4.4.0 to 4.5.0

Bumps [NUnit.Analyzers](https://github.com/nunit/nunit.analyzers) from 4.4.0 to 4.5.0.
- [Release notes](https://github.com/nunit/nunit.analyzers/releases)
- [Changelog](https://github.com/nunit/nunit.analyzers/blob/master/CHANGES.md)
- [Commits](https://github.com/nunit/nunit.analyzers/compare/4.4.0...4.5.0)

---
updated-dependencies:
- dependency-name: NUnit.Analyzers
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump Minio from 6.0.3 to 6.0.4

Bumps [Minio](https://github.com/minio/minio-dotnet) from 6.0.3 to 6.0.4.
- [Release notes](https://github.com/minio/minio-dotnet/releases)
- [Commits](https://github.com/minio/minio-dotnet/compare/6.0.3...6.0.4)

---
updated-dependencies:
- dependency-name: Minio
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump the aws-sdk group across 1 directory with 4 updates

Bumps the aws-sdk grou... (continued)

Run Details

11358 of 21338 branches covered (53.23%)

Branch coverage included in aggregate %.

1116 of 1482 new or added lines in 50 files covered. (75.3%)

19 existing lines in 10 files now uncovered.

32283 of 54673 relevant lines covered (59.05%)

17450.76 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewClassBasedProcessTask.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.Linq;
using Rdmp.Core.Curation.Data;
using Rdmp.Core.Curation.Data.DataLoad;
using Rdmp.Core.DataLoad.Engine;
using Rdmp.Core.DataLoad.Engine.Attachers;
using Rdmp.Core.DataLoad.Engine.DataProvider;
using Rdmp.Core.DataLoad.Engine.Mutilators;

namespace Rdmp.Core.CommandExecution.AtomicCommands;

public class ExecuteCommandCreateNewClassBasedProcessTask : BasicCommandExecution
{
    private readonly LoadMetadata _loadMetadata;
    private readonly LoadStage _loadStage;
    private Type _type;
    private ProcessTaskType _processTaskType;

    public ExecuteCommandCreateNewClassBasedProcessTask(IBasicActivateItems activator, LoadMetadata loadMetadata,
        LoadStage loadStage,
        [DemandsInitialization("Class to execute, must be an attacher, mutilater etc",
            TypeOf = typeof(IDisposeAfterDataLoad))]
        Type type) : base(activator)
    {
        _loadMetadata = loadMetadata;
        _loadStage = loadStage;

        if (type != null)
            SetType(type);
    }

    private void SetType(Type type)
    {
        _type = type;

        if (typeof(IAttacher).IsAssignableFrom(_type))
            _processTaskType = ProcessTaskType.Attacher;
        else if (typeof(IDataProvider).IsAssignableFrom(_type))
            _processTaskType = ProcessTaskType.DataProvider;
        else if (typeof(IMutilateDataTables).IsAssignableFrom(_type))
            _processTaskType = ProcessTaskType.MutilateDataTable;
        else
            SetImpossible(
                $"Type '{_type}' was not a compatible one e.g. IAttacher, IDataProvider or IMutilateDataTables");
    }

    private static Type[] GetProcessTaskTypes()
    {
        return Repositories.MEF.GetAllTypes().Where(static t =>
            // must not be interface or abstract
            !(t.IsInterface || t.IsAbstract) &&
            (
                // must implement one of these interfaces
                typeof(IAttacher).IsAssignableFrom(t) ||
                typeof(IDataProvider).IsAssignableFrom(t) ||
                typeof(IMutilateDataTables).IsAssignableFrom(t)
            )).ToArray();
    }

    public override void Execute()
    {
        if (_type == null)
        {
            if (BasicActivator.SelectType("Process Type", GetProcessTaskTypes(), out var chosen))
                SetType(chosen);
            else
                return;
        }
        var newTask = new ProcessTask(BasicActivator.RepositoryLocator.CatalogueRepository, _loadMetadata, _loadStage)
        {
            Path = _type.FullName,
            ProcessTaskType = _processTaskType,
            Name = _type.Name
        };
        newTask.SaveToDatabase();

        newTask.CreateArgumentsForClassIfNotExists(_type);

        Publish(_loadMetadata);
        Activate(newTask);
    }
}

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.Linq;
9	using Rdmp.Core.Curation.Data;
10	using Rdmp.Core.Curation.Data.DataLoad;
11	using Rdmp.Core.DataLoad.Engine;
12	using Rdmp.Core.DataLoad.Engine.Attachers;
13	using Rdmp.Core.DataLoad.Engine.DataProvider;
14	using Rdmp.Core.DataLoad.Engine.Mutilators;
15
16	namespace Rdmp.Core.CommandExecution.AtomicCommands;
17
18	public class ExecuteCommandCreateNewClassBasedProcessTask : BasicCommandExecution
19	{
20	private readonly LoadMetadata _loadMetadata;
21	private readonly LoadStage _loadStage;
22	private Type _type;
23	private ProcessTaskType _processTaskType;
24
25	public ExecuteCommandCreateNewClassBasedProcessTask(IBasicActivateItems activator, LoadMetadata loadMetadata,
26	LoadStage loadStage,
27	[DemandsInitialization("Class to execute, must be an attacher, mutilater etc",
28	TypeOf = typeof(IDisposeAfterDataLoad))]
29	Type type) : base(activator)	×
30	{
31	_loadMetadata = loadMetadata;	×
32	_loadStage = loadStage;	×
33
34	if (type != null)	×
35	SetType(type);	×
36	}	×
37
38	private void SetType(Type type)
39	{
40	_type = type;	×
41
42	if (typeof(IAttacher).IsAssignableFrom(_type))	×
43	_processTaskType = ProcessTaskType.Attacher;	×
44	else if (typeof(IDataProvider).IsAssignableFrom(_type))	×
45	_processTaskType = ProcessTaskType.DataProvider;	×
46	else if (typeof(IMutilateDataTables).IsAssignableFrom(_type))	×
47	_processTaskType = ProcessTaskType.MutilateDataTable;	×
48	else
49	SetImpossible(	×
50	$"Type '{_type}' was not a compatible one e.g. IAttacher, IDataProvider or IMutilateDataTables");	×
51	}	×
52
53	private static Type[] GetProcessTaskTypes()
54	{
55	return Repositories.MEF.GetAllTypes().Where(static t =>	×
56	// must not be interface or abstract	×
57	!(t.IsInterface \|\| t.IsAbstract) &&	×
58	(	×
59	// must implement one of these interfaces	×
60	typeof(IAttacher).IsAssignableFrom(t) \|\|	×
61	typeof(IDataProvider).IsAssignableFrom(t) \|\|	×
62	typeof(IMutilateDataTables).IsAssignableFrom(t)	×
63	)).ToArray();	×
64	}
65
66	public override void Execute()
67	{
68	if (_type == null)	×
69	{
70	if (BasicActivator.SelectType("Process Type", GetProcessTaskTypes(), out var chosen))	×
71	SetType(chosen);	×
72	else
73	return;	×
74	}
UNCOV 75	var newTask = new ProcessTask(BasicActivator.RepositoryLocator.CatalogueRepository, _loadMetadata, _loadStage)	×
76	{	×
77	Path = _type.FullName,	×
78	ProcessTaskType = _processTaskType,	×
79	Name = _type.Name	×
80	};	×
81	newTask.SaveToDatabase();	×
82
83	newTask.CreateArgumentsForClassIfNotExists(_type);	×
84
85	Publish(_loadMetadata);	×
86	Activate(newTask);	×
87	}	×
88	}

HicServices / RDMP / 13493861722

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