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

0.0

/Rdmp.Core/DataExport/DataExtraction/ExtractionTimeTimeCoverageAggregatorBucket.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;

namespace Rdmp.Core.DataExport.DataExtraction;

/// <summary>
/// The number of unique patients and record count on a given day of an ExtractionTimeTimeCoverageAggregator.
/// </summary>
public class ExtractionTimeTimeCoverageAggregatorBucket
{
    public enum BucketSize
    {
        Month,
        Year,
        Day
    }

    public DateTime Time { get; set; }
    public int CountOfTimesSeen { get; set; }
    public int CountOfDistinctIdentifiers => _identifiersSeen.Count;
    private readonly HashSet<object> _identifiersSeen = new();

    public ExtractionTimeTimeCoverageAggregatorBucket(DateTime time)
    {
        Time = time;
    }

    public bool IsTimeInBucket(DateTime toCheck, BucketSize bucketSize)
    {
        var upperLimit = Time;
        upperLimit = bucketSize switch
        {
            BucketSize.Day => upperLimit.AddDays(1),
            BucketSize.Month => upperLimit.AddMonths(1),
            BucketSize.Year => upperLimit.AddYears(1),
            _ => upperLimit
        };

        return toCheck >= Time && toCheck < upperLimit;
    }

    public void SawIdentifier(object identifier)
    {
        CountOfTimesSeen++;

        if (identifier == DBNull.Value)
            return;

        if (identifier == null)
            return;

        _identifiersSeen.Add(identifier);
    }

    public static DateTime RoundDateTimeDownToNearestBucketFloor(DateTime toRound, BucketSize bucketSize)
    {
        return bucketSize switch
        {
            BucketSize.Day => new DateTime(toRound.Year, toRound.Month, toRound.Day),
            BucketSize.Month => new DateTime(toRound.Year, toRound.Month, 1),
            BucketSize.Year => new DateTime(toRound.Year, 1, 1),
            _ => throw new NotSupportedException($"Unknown bucket size {bucketSize}")
        };
    }

    public static DateTime IncreaseDateTimeBy(DateTime toAdd, BucketSize bucketSize)
    {
        return bucketSize switch
        {
            BucketSize.Day => toAdd.AddDays(1),
            BucketSize.Month => toAdd.AddMonths(1),
            BucketSize.Year => toAdd.AddYears(1),
            _ => throw new NotSupportedException($"Unknown bucket size {bucketSize}")
        };
    }

    public static DateTime DecreaseDateTimeBy(DateTime toAdd, BucketSize bucketSize)
    {
        return bucketSize switch
        {
            BucketSize.Day => toAdd.AddDays(-1),
            BucketSize.Month => toAdd.AddMonths(-1),
            BucketSize.Year => toAdd.AddYears(-1),
            _ => throw new NotSupportedException($"Unknown bucket size {bucketSize}")
        };
    }
}

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
10	namespace Rdmp.Core.DataExport.DataExtraction;
11
12	/// <summary>
13	/// The number of unique patients and record count on a given day of an ExtractionTimeTimeCoverageAggregator.
14	/// </summary>
15	public class ExtractionTimeTimeCoverageAggregatorBucket
16	{
17	public enum BucketSize
18	{
19	Month,
20	Year,
21	Day
22	}
23
24	public DateTime Time { get; set; }	×
25	public int CountOfTimesSeen { get; set; }	×
26	public int CountOfDistinctIdentifiers => _identifiersSeen.Count;	×
27	private readonly HashSet<object> _identifiersSeen = new();	×
28
29	public ExtractionTimeTimeCoverageAggregatorBucket(DateTime time)	×
30	{
31	Time = time;	×
32	}	×
33
34	public bool IsTimeInBucket(DateTime toCheck, BucketSize bucketSize)
35	{
36	var upperLimit = Time;	×
37	upperLimit = bucketSize switch	×
38	{	×
39	BucketSize.Day => upperLimit.AddDays(1),	×
40	BucketSize.Month => upperLimit.AddMonths(1),	×
41	BucketSize.Year => upperLimit.AddYears(1),	×
42	_ => upperLimit	×
43	};	×
44
45	return toCheck >= Time && toCheck < upperLimit;	×
46	}
47
48	public void SawIdentifier(object identifier)
49	{
50	CountOfTimesSeen++;	×
51
52	if (identifier == DBNull.Value)	×
53	return;	×
54
55	if (identifier == null)	×
56	return;	×
57
58	_identifiersSeen.Add(identifier);	×
59	}	×
60
61	public static DateTime RoundDateTimeDownToNearestBucketFloor(DateTime toRound, BucketSize bucketSize)
62	{
63	return bucketSize switch	×
64	{	×
65	BucketSize.Day => new DateTime(toRound.Year, toRound.Month, toRound.Day),	×
66	BucketSize.Month => new DateTime(toRound.Year, toRound.Month, 1),	×
67	BucketSize.Year => new DateTime(toRound.Year, 1, 1),	×
68	_ => throw new NotSupportedException($"Unknown bucket size {bucketSize}")	×
69	};	×
70	}
71
72	public static DateTime IncreaseDateTimeBy(DateTime toAdd, BucketSize bucketSize)
73	{
74	return bucketSize switch	×
75	{	×
76	BucketSize.Day => toAdd.AddDays(1),	×
77	BucketSize.Month => toAdd.AddMonths(1),	×
78	BucketSize.Year => toAdd.AddYears(1),	×
79	_ => throw new NotSupportedException($"Unknown bucket size {bucketSize}")	×
80	};	×
81	}
82
83	public static DateTime DecreaseDateTimeBy(DateTime toAdd, BucketSize bucketSize)
84	{
85	return bucketSize switch	×
86	{	×
87	BucketSize.Day => toAdd.AddDays(-1),	×
88	BucketSize.Month => toAdd.AddMonths(-1),	×
89	BucketSize.Year => toAdd.AddYears(-1),	×
90	_ => throw new NotSupportedException($"Unknown bucket size {bucketSize}")	×
91	};	×
92	}
93	}

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