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

65.0

/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/LoadMetadataVersionNode.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.Collections.Generic;
using Rdmp.Core.Curation.Data;
using Rdmp.Core.Curation.Data.Cohort;
using Rdmp.Core.Curation.Data.DataLoad;

namespace Rdmp.Core.Providers.Nodes.LoadMetadataNodes;

/// <summary>
/// Collection of all the <see cref="Catalogue"/>s which are currently associated with a given <see cref="Curation.Data.DataLoad.LoadMetadata"/>.  This governs
/// which tables are created in RAW=>STAGING=>LIVE.
/// </summary>
public class LoadMetadataVersionNode : Node, IOrderable
{
    public LoadMetadata LoadMetadata { get; }

    public int Order
    {
        get => 1;
        set { }
    }

    public List<LoadMetadata> LoadMetadataVersions { get; set; }

    public LoadMetadataVersionNode(LoadMetadata lmd)
    {
        LoadMetadata = lmd;
    }

    public override string ToString() => "Versions";

    protected bool Equals(LoadMetadataVersionNode other) => Equals(LoadMetadata, other.LoadMetadata);

    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((LoadMetadataVersionNode)obj);
    }

    public override int GetHashCode() => HashCode.Combine(LoadMetadata);
}

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.Collections.Generic;
9	using Rdmp.Core.Curation.Data;
10	using Rdmp.Core.Curation.Data.Cohort;
11	using Rdmp.Core.Curation.Data.DataLoad;
12
13	namespace Rdmp.Core.Providers.Nodes.LoadMetadataNodes;
14
15	/// <summary>
16	/// Collection of all the <see cref="Catalogue"/>s which are currently associated with a given <see cref="Curation.Data.DataLoad.LoadMetadata"/>. This governs
17	/// which tables are created in RAW=>STAGING=>LIVE.
18	/// </summary>
19	public class LoadMetadataVersionNode : Node, IOrderable
20	{
21	public LoadMetadata LoadMetadata { get; }	9,340✔
22
23	public int Order
24	{
NEW 25	get => 1;	×
NEW 26	set { }	×
27	}
28
29	public List<LoadMetadata> LoadMetadataVersions { get; set; }	1,304✔
30
31	public LoadMetadataVersionNode(LoadMetadata lmd)	652✔
32	{
33	LoadMetadata = lmd;	652✔
34	}	652✔
35
NEW 36	public override string ToString() => "Versions";	×
37
NEW 38	protected bool Equals(LoadMetadataVersionNode other) => Equals(LoadMetadata, other.LoadMetadata);	×
39
40	public override bool Equals(object obj)
41	{
42	if (obj is null) return false;	5,264!
43	if (ReferenceEquals(this, obj)) return true;	5,916✔
44	if (obj.GetType() != GetType()) return false;	9,224!
NEW 45	return Equals((LoadMetadataVersionNode)obj);	×
46	}
47
48	public override int GetHashCode() => HashCode.Combine(LoadMetadata);	3,912✔
49	}

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