12084537692

Committed 29 Nov 2024 12:12PM UTC coverage: 57.449% (+0.06%) from 57.386%

Build # 12084537692

Build Type

push

github

Committed by

web-flow

Commit Message

Release: 8.4.0 (#2006)

* add changelog

* Bugfix/rdmp 253 filter ordering (#2007)

* add start

* partial

* tidy up code

* filter updates

* update db migrations

* update correct db

* update changelog

* add base creation sql

* fix create

* tidy up

* update insert

* tidy up

* interim

* style updates

* add some info

* start of where clause

* improved

* improved dates

* improve bookends

* add changelog

* update changelog

* improve ui with frequency

* tidy up for tests

* add summary

* rename chart

* interim people

* add people label

* better where

* move items around

* fix up tests

* tidy up code

* tidy up

* made db independant

* add changelog

* add missing file

* Bugfix/rdmp 259 delta load off by one issue (#2024)

* fix off by one issue

* update tests

* update changelog

* check for multi-server query

* update changelog

* update changelog

* Add override for RAW table date column in delta loads (#2052)

* fix table attacher special column issue

* add override

* add extra override

* fix tests

* tidy up

* add docs

* update deps

* add safe ref

* interim

* working check

* tidy up

* add changelog

* fix typos

* update typo

* fix typos

* fix typos

* Changes made to popup buttons (#2076)

* Changes made to popup buttons

* Bump the aws-sdk group with 4 updates (#2074)

Bumps the aws-sdk group with 4 updates: [AWSSDK.S3](https://github.com/aws/aws-sdk-net), [AWSSDK.SecurityToken](https://github.com/aws/aws-sdk-net), [AWSSDK.SSO](https://github.com/aws/aws-sdk-net) and [AWSSDK.SSOOIDC](https://github.com/aws/aws-sdk-net).


Updates `AWSSDK.S3` from 3.7.407 to 3.7.407.1
- [Release notes](https://github.com/aws/aws-sdk-net/releases)
- [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD)
- [Commits](https://github.com/aws/aws-sdk-net/commits)

Updates `AWSSD... (continued)

Run Details

11298 of 21215 branches covered (53.25%)

Branch coverage included in aggregate %.

439 of 673 new or added lines in 30 files covered. (65.23%)

5 existing lines in 4 files now uncovered.

32146 of 54407 relevant lines covered (59.08%)

17105.99 hits per line

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

87.88

/Rdmp.Core/Curation/DataHelper/RegexRedaction/RegexRedaction.cs

﻿// Copyright (c) The University of Dundee 2024-2024
// 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 Rdmp.Core.Curation.Data;
using Rdmp.Core.MapsDirectlyToDatabaseTable;
using Rdmp.Core.MapsDirectlyToDatabaseTable.Attributes;
using Rdmp.Core.Repositories;
using Rdmp.Core.ReusableLibraryCode.Annotations;
using System;
using System.Collections.Generic;
using System.Data.Common;

namespace Rdmp.Core.Curation.DataHelper.RegexRedaction;


/// <summary>
/// Stores a redaction
/// </summary>
public class RegexRedaction : DatabaseEntity, IRegexRedaction

{
    private int _redactionConfigurationID;
    private int _startingIndex;
    private string _redactedValue;
    private string _replacementValue;
    private int _columnInfoID;

    #region Database Properties

    public int RedactionConfiguration_ID
    {
        get => _redactionConfigurationID;
        set => SetField(ref _redactionConfigurationID, value);
    }

    [UsefulProperty]
    [NotNull]
    public string RedactedValue
    {
        get => _redactedValue;
        set => SetField(ref _redactedValue, value.ToString());
    }

    [UsefulProperty]
    [NotNull]
    public string ReplacementValue
    {
        get => _replacementValue;
        set => SetField(ref _replacementValue, value.ToString());
    }

    [NotNull]
    public int StartingIndex
    {
        get => _startingIndex;
        set => SetField(ref _startingIndex, value);
    }

    public int ColumnInfo_ID
    {
        get => _columnInfoID;
        set => SetField(ref _columnInfoID, value);
    }
    #endregion

    #region Relationships
    [NoMappingToDatabase]
    public List<RegexRedactionKey> RedactionKeys => [.. CatalogueRepository.GetAllObjectsWhere<RegexRedactionKey>("RegexRedaction_ID", this.ID)];
    #endregion


    public RegexRedaction() { }

    public RegexRedaction(ICatalogueRepository repository, int redactionConfigurationID, int startingIndex, string redactionValue, string replacementValue, int columnInfoID, Dictionary<ColumnInfo,string> pkValues)
    {
        repository.InsertAndHydrate(this, new Dictionary<string, object> {
            {"RedactionConfiguration_ID",redactionConfigurationID},
            {"StartingIndex",startingIndex},
            {"RedactedValue", redactionValue },
            {"ReplacementValue", replacementValue },
            {"ColumnInfo_ID", columnInfoID }
        });
        foreach (var tuple in pkValues)
        {
            var key = new RegexRedactionKey(repository, this, tuple.Key, tuple.Value);
            key.SaveToDatabase();
        }
    }

    internal RegexRedaction(ICatalogueRepository repository, DbDataReader r) : base(repository, r)
    {
        _redactionConfigurationID = Int32.Parse(r["RedactionConfiguration_ID"].ToString());
        _startingIndex = Int32.Parse(r["StartingIndex"].ToString());
        _replacementValue = r["ReplacementValue"].ToString();
        _redactedValue = r["RedactedValue"].ToString();
        _columnInfoID = Int32.Parse(r["ColumnInfo_ID"].ToString());
    }
}

1	// Copyright (c) The University of Dundee 2024-2024
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 Rdmp.Core.Curation.Data;
8	using Rdmp.Core.MapsDirectlyToDatabaseTable;
9	using Rdmp.Core.MapsDirectlyToDatabaseTable.Attributes;
10	using Rdmp.Core.Repositories;
11	using Rdmp.Core.ReusableLibraryCode.Annotations;
12	using System;
13	using System.Collections.Generic;
14	using System.Data.Common;
15
16	namespace Rdmp.Core.Curation.DataHelper.RegexRedaction;
17
18
19	/// <summary>
20	/// Stores a redaction
21	/// </summary>
22	public class RegexRedaction : DatabaseEntity, IRegexRedaction
23
24	{
25	private int _redactionConfigurationID;
26	private int _startingIndex;
27	private string _redactedValue;
28	private string _replacementValue;
29	private int _columnInfoID;
30
31	#region Database Properties
32
33	public int RedactionConfiguration_ID
34	{
35	get => _redactionConfigurationID;	8✔
36	set => SetField(ref _redactionConfigurationID, value);	16✔
37	}
38
39	[UsefulProperty]
40	[NotNull]
41	public string RedactedValue
42	{
43	get => _redactedValue;	20✔
44	set => SetField(ref _redactedValue, value.ToString());	16✔
45	}
46
47	[UsefulProperty]
48	[NotNull]
49	public string ReplacementValue
50	{
51	get => _replacementValue;	40✔
52	set => SetField(ref _replacementValue, value.ToString());	16✔
53	}
54
55	[NotNull]
56	public int StartingIndex
57	{
58	get => _startingIndex;	58✔
59	set => SetField(ref _startingIndex, value);	16✔
60	}
61
62	public int ColumnInfo_ID
63	{
64	get => _columnInfoID;	14✔
65	set => SetField(ref _columnInfoID, value);	16✔
66	}
67	#endregion
68
69	#region Relationships
70	[NoMappingToDatabase]
71	public List<RegexRedactionKey> RedactionKeys => [.. CatalogueRepository.GetAllObjectsWhere<RegexRedactionKey>("RegexRedaction_ID", this.ID)];	22✔
72	#endregion
73
74
NEW 75	public RegexRedaction() { }	×
76
77	public RegexRedaction(ICatalogueRepository repository, int redactionConfigurationID, int startingIndex, string redactionValue, string replacementValue, int columnInfoID, Dictionary<ColumnInfo,string> pkValues)	16✔
78	{
79	repository.InsertAndHydrate(this, new Dictionary<string, object> {	16✔
80	{"RedactionConfiguration_ID",redactionConfigurationID},	16✔
81	{"StartingIndex",startingIndex},	16✔
82	{"RedactedValue", redactionValue },	16✔
83	{"ReplacementValue", replacementValue },	16✔
84	{"ColumnInfo_ID", columnInfoID }	16✔
85	});	16✔
86	foreach (var tuple in pkValues)	32!
87	{
NEW 88	var key = new RegexRedactionKey(repository, this, tuple.Key, tuple.Value);	×
NEW 89	key.SaveToDatabase();	×
90	}
91	}	16✔
92
93	internal RegexRedaction(ICatalogueRepository repository, DbDataReader r) : base(repository, r)	24✔
94	{
95	_redactionConfigurationID = Int32.Parse(r["RedactionConfiguration_ID"].ToString());	24✔
96	_startingIndex = Int32.Parse(r["StartingIndex"].ToString());	24✔
97	_replacementValue = r["ReplacementValue"].ToString();	24✔
98	_redactedValue = r["RedactedValue"].ToString();	24✔
99	_columnInfoID = Int32.Parse(r["ColumnInfo_ID"].ToString());	24✔
100	}	24✔
101	}

HicServices / RDMP / 12084537692

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