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.

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

Fix IdentyRef parsing #243

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions src/aggregator-webshared/RequestHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,10 @@ static IdentityRef ConvertOrDefault(string input)
return null;
}

var uniqueNameLength = uniqueNameEndIndex - uniqueNameStartIndex + 1;

return new IdentityRef()
{
DisplayName = input.Substring(0, uniqueNameStartIndex).Trim(),
UniqueName = new string(input.Skip(uniqueNameStartIndex + 1).Take(uniqueNameLength).ToArray())
DisplayName = input[0..uniqueNameStartIndex].Trim(),
UniqueName = input[(uniqueNameStartIndex + 1)..uniqueNameEndIndex]
};
}

Expand All @@ -125,13 +123,15 @@ static IdentityRef ConvertOrDefault(string input)

foreach (var identityField in workItem.Fields.Where(field => identityFieldReferenceNameEndings.Any(name => field.Key.EndsWith(name))).ToList())
{
if (identityField.Value is string identityString)
IdentityRef identityRef = identityField.Value switch
{
workItem.Fields[identityField.Key] = ConvertOrDefault(identityString) ?? identityField.Value;
}
else if (identityField.Value is JsonElement identityElement)
string identityString => ConvertOrDefault(identityString),
JsonElement identityElement => ConvertOrDefault(identityElement.GetString()),
_ => null
};
if (identityRef != null)
{
workItem.Fields[identityField.Key] = ConvertOrDefault(identityElement.GetString()) ?? identityField.Value;
workItem.Fields[identityField.Key] = identityRef;
}
}
}
Expand Down
59 changes: 59 additions & 0 deletions src/unittests-function/RequestHelperTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
using System.Collections.Generic;
using aggregator;
using Microsoft.Extensions.Logging;
using Microsoft.TeamFoundation.WorkItemTracking.WebApi.Models;
using Microsoft.VisualStudio.Services.WebApi;
using Xunit;


namespace unittests_function
{
public class RequestHelperTests
{
[Fact]
public void MigrateIdentityInformationUpdatesIdentityFields()
{
var logger = NSubstitute.Substitute.For<ILogger>();
WorkItem workItem = new WorkItem
{
Fields = new Dictionary<string, object>
{
{ "System.WorkItemType", "Bug" },
{ "FixedBy", "Jane Doe <jdoe@example.com>" },
},
};

new RequestHelper(logger).MigrateIdentityInformation("1.0", workItem);

var identityValue = workItem.Fields["FixedBy"];
Assert.IsType<IdentityRef>(identityValue);
Assert.Equal("Jane Doe", ((IdentityRef)identityValue).DisplayName);
Assert.Equal("jdoe@example.com", ((IdentityRef)identityValue).UniqueName);
}

[Fact]
public void MigrateIdentityInformationDoesNotUpdateStrings()
{
var logger = NSubstitute.Substitute.For<ILogger>();
WorkItem workItem = new WorkItem
{
Fields = new Dictionary<string, object>
{
{ "System.WorkItemType", "Bug" },
{ "VerifyBy", "GA" },
{ "SmileTo", ">_<" },
},
};

new RequestHelper(logger).MigrateIdentityInformation("1.0", workItem);

var stringValue = workItem.Fields["VerifyBy"];
Assert.IsType<string>(stringValue);
Assert.Equal("GA", stringValue);

stringValue = workItem.Fields["SmileTo"];
Assert.IsType<string>(stringValue);
Assert.Equal(">_<", stringValue);
}
}
}