Skip to content

fix to return multiple vaules in metadata #828

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

Merged
merged 2 commits into from
Jun 5, 2023
Merged

fix to return multiple vaules in metadata #828

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e7f6a6
fix to return multiple vaules in metadata
neildsouth Jun 5, 2023
1477e4e
merge in develop
neildsouth Jun 5, 2023
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
22 changes: 17 additions & 5 deletions src/TaskManager/Plug-ins/Email/EmailPlugin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public override async Task<ExecutionStatus> ExecuteTask(CancellationToken cancel

try
{
var metadata = new Dictionary<string, string>();
var metadata = new Dictionary<string, List<string>>();
if (Event.Inputs.Any())
{
foreach (var input in Event.Inputs)
Expand All @@ -132,7 +132,7 @@ public override async Task<ExecutionStatus> ExecuteTask(CancellationToken cancel
}
}

var emailRequest = GenerateEmailRequestEventMessage(metadata);
var emailRequest = GenerateEmailRequestEventMessage(FlattenMeta(metadata));
await SendEmailRequestEvent(emailRequest).ConfigureAwait(false);

return new ExecutionStatus { Status = TaskExecutionStatus.Accepted, FailureReason = FailureReason.None, Stats = new Dictionary<string, string> { { "IdentityKey", emailRequest.Body.Id.ToString() } } };
Expand All @@ -145,7 +145,17 @@ public override async Task<ExecutionStatus> ExecuteTask(CancellationToken cancel
}
}

private async Task<Dictionary<string, string>> AddRawMetaFromFile(Dictionary<string, string> metadata, string path, string bucketName)
private static Dictionary<string, string> FlattenMeta(Dictionary<string, List<string>> input)
{
var values = new Dictionary<string, string>();
foreach (var key in input.Keys)
{
values.Add(key, string.Join(",", input[key].Distinct()));
}
return values;
}

private async Task<Dictionary<string, List<string>>> AddRawMetaFromFile(Dictionary<string, List<string>> metadata, string path, string bucketName)
{
if (_includeMetadata is null || _includeMetadata.Count() == 0)
{
Expand All @@ -168,7 +178,8 @@ private async Task<Dictionary<string, string>> AddRawMetaFromFile(Dictionary<str

foreach (var item in _includeMetadata)
{
if (metadata.ContainsKey(item)) continue;
var values = new List<string>();
if (metadata.ContainsKey(item)) values = metadata[item];

DicomTag tag;
try
Expand All @@ -181,7 +192,8 @@ private async Task<Dictionary<string, string>> AddRawMetaFromFile(Dictionary<str
}
if (tag is not null)
{
metadata.Add(item, dcmFile.Dataset.GetString(tag));
values.Add(dcmFile.Dataset.GetString(tag).Trim());
metadata.Add(item, values);
}
}
}
Expand Down