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

87.8

/Rdmp.Core/CommandLine/Interactive/Picking/PickObjectByQuery.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 System.Linq;
using System.Reflection;
using System.Text.RegularExpressions;
using Rdmp.Core.CommandExecution;
using Rdmp.Core.Curation.Data;
using Rdmp.Core.MapsDirectlyToDatabaseTable;

namespace Rdmp.Core.CommandLine.Interactive.Picking;

/// <summary>
/// Determines if a command line argument provided was a reference to one or more <see cref="DatabaseEntity"/> matching based on property (e.g. "Catalogue?Folder:*edris*")
/// </summary>
public class PickObjectByQuery : PickObjectBase
{
    public override string Format => "{Type}?{Property}:{PropertyValue}";

    public override string Help =>
        @"Type: must be an RDMP object type e.g. Catalogue, Project etc.
Property: must be a property of the Type class.
NamePattern: must be a value that could appear for the given Property.  Comparison will be via ToString on property value.";

    public override IEnumerable<string> Examples => new[]
    {
        "CatalogueItem?Catalogue_ID:55",
        "Catalogue?Folder:*edris*"
    };

    public PickObjectByQuery(IBasicActivateItems activator) :
        base(activator,
            new Regex(@"^(\w+)\?(\w+):([^:]+)$", RegexOptions.IgnoreCase))
    {
    }

    public override bool IsMatch(string arg, int idx)
    {
        var baseMatch = base.IsMatch(arg, idx);

        //only considered  match if the first letter is an Rdmp Type e.g. "Catalogue:fish" but not "C:\fish"
        return baseMatch && IsDatabaseObjectType(Regex.Match(arg).Groups[1].Value, out _);
    }

    public override CommandLineObjectPickerArgumentValue Parse(string arg, int idx)
    {
        if (IsDatabaseObjectType(arg, out var t))
            return new CommandLineObjectPickerArgumentValue(arg, idx, GetAllObjects(t).ToArray());

        var objByToString = MatchOrThrow(arg, idx);

        var objectType = objByToString.Groups[1].Value;
        var propertyName = objByToString.Groups[2].Value;
        var objectToString = objByToString.Groups[3].Value;

        var dbObjectType = ParseDatabaseEntityType(objectType, arg, idx);

        var property = dbObjectType.GetProperty(propertyName) ??
                       throw new Exception(
                           $"Unknown property '{propertyName}'.  Did not exist on Type '{dbObjectType.Name}'");
        var objs = GetObjectByToString(dbObjectType, property, objectToString);
        return new CommandLineObjectPickerArgumentValue(arg, idx, objs.Cast<IMapsDirectlyToDatabaseTable>().ToArray());
    }

    private IEnumerable<object> GetObjectByToString(Type dbObjectType, PropertyInfo property, string str)
    {
        return GetAllObjects(dbObjectType).Where(o =>
        {
            var value = property.GetValue(o)?.ToString() ?? "Null";
            return FilterByPattern(value, str);
        });
    }
}

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 System.Linq;
10	using System.Reflection;
11	using System.Text.RegularExpressions;
12	using Rdmp.Core.CommandExecution;
13	using Rdmp.Core.Curation.Data;
14	using Rdmp.Core.MapsDirectlyToDatabaseTable;
15
16	namespace Rdmp.Core.CommandLine.Interactive.Picking;
17
18	/// <summary>
19	/// Determines if a command line argument provided was a reference to one or more <see cref="DatabaseEntity"/> matching based on property (e.g. "Catalogue?Folder:edris")
20	/// </summary>
21	public class PickObjectByQuery : PickObjectBase
22	{
23	public override string Format => "{Type}?{Property}:{PropertyValue}";	2✔
24
25	public override string Help =>
26	@"Type: must be an RDMP object type e.g. Catalogue, Project etc.	×
27	Property: must be a property of the Type class.	×
28	NamePattern: must be a value that could appear for the given Property. Comparison will be via ToString on property value.";	×
29
30	public override IEnumerable<string> Examples => new[]	2✔
31	{	2✔
32	"CatalogueItem?Catalogue_ID:55",	2✔
33	"Catalogue?Folder:edris"	2✔
34	};	2✔
35
36	public PickObjectByQuery(IBasicActivateItems activator) :
37	base(activator,	10,544✔
38	new Regex(@"^(\w+)\?(\w+):([^:]+)$", RegexOptions.IgnoreCase))	10,544✔
39	{
40	}	10,544✔
41
42	public override bool IsMatch(string arg, int idx)
43	{
44	var baseMatch = base.IsMatch(arg, idx);	344✔
45
46	//only considered match if the first letter is an Rdmp Type e.g. "Catalogue:fish" but not "C:\fish"
47	return baseMatch && IsDatabaseObjectType(Regex.Match(arg).Groups[1].Value, out _);	344✔
48	}
49
50	public override CommandLineObjectPickerArgumentValue Parse(string arg, int idx)
51	{
52	if (IsDatabaseObjectType(arg, out var t))	8!
53	return new CommandLineObjectPickerArgumentValue(arg, idx, GetAllObjects(t).ToArray());	×
54
55	var objByToString = MatchOrThrow(arg, idx);	8✔
56
57	var objectType = objByToString.Groups[1].Value;	8✔
58	var propertyName = objByToString.Groups[2].Value;	8✔
59	var objectToString = objByToString.Groups[3].Value;	8✔
60
61	var dbObjectType = ParseDatabaseEntityType(objectType, arg, idx);	8✔
62
63	var property = dbObjectType.GetProperty(propertyName) ??	8✔
64	throw new Exception(	8✔
65	$"Unknown property '{propertyName}'. Did not exist on Type '{dbObjectType.Name}'");	8✔
66	var objs = GetObjectByToString(dbObjectType, property, objectToString);	6✔
67	return new CommandLineObjectPickerArgumentValue(arg, idx, objs.Cast<IMapsDirectlyToDatabaseTable>().ToArray());	6✔
68	}
69
70	private IEnumerable<object> GetObjectByToString(Type dbObjectType, PropertyInfo property, string str)
71	{
72	return GetAllObjects(dbObjectType).Where(o =>	6✔
73	{	6✔
74	var value = property.GetValue(o)?.ToString() ?? "Null";	16✔
75	return FilterByPattern(value, str);	16✔
76	});	6✔
77	}
78	}

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