Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create filter to format time with a colon #515

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Create filter to format time with a colon #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0867100
create filter to format time with a colon
wi-y Jan 17, 2024
5ab839a
update time filter to be more generic
wi-y Jan 30, 2024
22a2a5e
remove inputFormat validation, add arg for error suppression
wi-y Jan 31, 2024
a521f55
add missing file updates
wi-y Jan 31, 2024
12d100b
fix code to handle timezones
wi-y Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions src/Microsoft.Health.Fhir.Liquid.Converter.UnitTests/Filters/DateFiltersTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,24 @@ public static IEnumerable<object[]> GetInvalidDataForAddSeconds()
yield return new object[] { @"2001-01T" };
}

public static IEnumerable<object[]> GetValidDataAndFormatForTimeHandling()
{
yield return new object[] { @"0730", "HHmm", "preserve", false, "07:30:00" };
yield return new object[] { @"1730", "HHmm", "preserve", false, "17:30:00" };
yield return new object[] { @"12010000", "HHmmssff", "preserve", false, "12:01:00" };
yield return new object[] { @"12010001", "HHmmssff", "preserve", false, "12:01:00.0100000" };
yield return new object[] { @"094010", "HHmmss", "preserve", false, "09:40:10" };
yield return new object[] { @"09:45:50", "HH:mm:ss", "preserve", false, "09:45:50" };
yield return new object[] { @"144100.0000+0300", "HHmmss.ffffzzz", "utc", false, "11:41:00" };
yield return new object[] { @"144100.0000+0300", "HHmmss.ffffzzz", "preserve", false, "14:41:00" };
yield return new object[] { @"18:45", "HHmm", "preserve", true, "18:45" }; // time format does not match format string, but date parsing error is suppressed
}

public static IEnumerable<object[]> GetInvalidDataForTimeHandling()
{
yield return new object[] { @"9999", "HHmm" };
}

[Theory]
[MemberData(nameof(GetValidDataForAddSeconds))]
public void GivenSeconds_WhenAddOnValidDateTime_CorrectDateTimeStringShouldBeReturned(string originalDateTime, double seconds, string timeZoneHandling, string expectedDateTime)
Expand Down Expand Up @@ -356,6 +374,22 @@ public void GivenAnInvalidDateTime_WhenFormatAsHl7DateTime_ExceptionShouldBeThro
Assert.Equal(FhirConverterErrorCode.InvalidDateTimeFormat, exception.FhirConverterErrorCode);
}

[Theory]
[MemberData(nameof(GetValidDataAndFormatForTimeHandling))]
public void GivenAValidData_WhenFormatTimeWithColonAndInputFormatProvided_FormattedTimeOrOriginalInputShouldBeReturned(string input, string inputFormat, string timeZoneHandling, bool suppressParsingError, string expectedDateTime)
{
var result = Filters.FormatTimeWithColon(input, inputFormat, timeZoneHandling, suppressParsingError);
Assert.Equal(expectedDateTime, result);
}

[Theory]
[MemberData(nameof(GetInvalidDataForTimeHandling))]
public void GivenInvalidData_WhenFormatAsTimeInterval_ExceptionThrown(string input, string inputFormat)
{
var exception = Assert.Throws<RenderException>(() => Filters.FormatTimeWithColon(input, inputFormat));
Assert.Equal(FhirConverterErrorCode.InvalidDateTimeFormat, exception.FhirConverterErrorCode);
}

[Fact]
public void NowTest()
{
Expand Down
37 changes: 37 additions & 0 deletions src/Microsoft.Health.Fhir.Liquid.Converter/Filters/DateFilters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
// -------------------------------------------------------------------------------------------------

using System;
using System.Globalization;
using System.Linq;
using Microsoft.Health.Fhir.Liquid.Converter.Exceptions;
using Microsoft.Health.Fhir.Liquid.Converter.Models;

Expand Down Expand Up @@ -96,6 +98,41 @@ public static string Now(string input, string format = "yyyy-MM-ddTHH:mm:ss.FFFZ
return DateTime.UtcNow.ToString(format);
}

/* Converts an HL7v2 time to the FHIR format for time
/ HL7v2 - 2.8.35.2 Explicit time interval (ST). Format: HHmm
/ HL7v2 - 2.4.5.6 TM time. Format: HHMM[SS[.SSSS]][+/-ZZZZ]
/ FHIR - time https://build.fhir.org/datatypes.html#time
*/
public static string FormatTimeWithColon(string input, string inputFormat, string timeZoneHandling = "preserve", bool suppressParsingError = false)
{
if (!Enum.TryParse(timeZoneHandling, true, out TimeZoneHandlingMethod outputTimeZoneHandling))
{
throw new RenderException(FhirConverterErrorCode.InvalidTimeZoneHandling, Resources.InvalidTimeZoneHandling);
}

var dt = TimeSpan.Zero;
try
{
dt = outputTimeZoneHandling switch
{
TimeZoneHandlingMethod.Preserve => DateTimeOffset.ParseExact(input, inputFormat, CultureInfo.InvariantCulture).TimeOfDay,
TimeZoneHandlingMethod.Utc => DateTimeOffset.ParseExact(input, inputFormat, CultureInfo.InvariantCulture).ToUniversalTime().TimeOfDay,
_ => throw new ArgumentException(Resources.InvalidTimeZoneHandling),
};
}
catch (Exception)
{
if (suppressParsingError)
{
return input;
}

throw new RenderException(FhirConverterErrorCode.InvalidDateTimeFormat, string.Format(Resources.InvalidDateTimeFormat, input));
}

return dt.ToString();
}

public static string FormatAsHl7v2DateTime(string input, string timeZoneHandling = "preserve")
{
if (string.IsNullOrEmpty(input))
Expand Down