Skip to content
This repository was archived by the owner on Jun 27, 2019. It is now read-only.

Commit d5cce61

Browse files
Improved coding style of GitHubIssueTracker
1 parent 287e406 commit d5cce61

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

src/GitTools.IssueTrackers/IssueTrackers/GitHub/GitHubIssueTracker.cs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -49,37 +49,37 @@ public override async Task<IEnumerable<Issue>> GetIssuesAsync(IssueTrackerFilter
4949

5050
var readOnlyList = forRepository.Where(i => i.ClosedAt > filter.Since);
5151

52-
Func<User, string> getUserName = u =>
53-
{
54-
var login = u.Login;
55-
if (!_userCache.ContainsKey(login))
56-
{
57-
_userCache.Add(login, string.IsNullOrEmpty(u.Name) ? gitHubClient.User.Get(login).Result : u);
58-
}
59-
60-
var user = _userCache[login];
61-
if (user != null)
62-
{
63-
return user.Name;
64-
}
65-
66-
return null;
67-
};
68-
6952
return readOnlyList.Select(i => new Issue("#" + i.Number.ToString(CultureInfo.InvariantCulture))
7053
{
7154
DateClosed = i.ClosedAt,
7255
Url = i.HtmlUrl.ToString(),
7356
Title = i.Title,
7457
IssueType = i.PullRequest == null ? IssueType.Issue : IssueType.PullRequest,
7558
Labels = i.Labels.Select(l => l.Name).ToArray(),
76-
Contributors = i.PullRequest == null ? new List<GitTools.IssueTrackers.Contributor>() : new List<GitTools.IssueTrackers.Contributor>
59+
Contributors = i.PullRequest == null ? new GitTools.IssueTrackers.Contributor[0] : new []
7760
{
78-
new GitTools.IssueTrackers.Contributor(getUserName(i.User), i.User.Login, i.User.HtmlUrl)
61+
new GitTools.IssueTrackers.Contributor(GetUserName(gitHubClient, i.User), i.User.Login, i.User.HtmlUrl)
7962
}
8063
});
8164
}
8265

66+
private string GetUserName(GitHubClient client, User u)
67+
{
68+
var login = u.Login;
69+
if (!_userCache.ContainsKey(login))
70+
{
71+
_userCache.Add(login, string.IsNullOrEmpty(u.Name) ? client.User.Get(login).Result : u);
72+
}
73+
74+
var user = _userCache[login];
75+
if (user != null)
76+
{
77+
return user.Name;
78+
}
79+
80+
return null;
81+
}
82+
8383
private RepositoryIssueRequest PrepareFilter(IssueTrackerFilter filter)
8484
{
8585
var repositoryIssueRequest = new RepositoryIssueRequest

src/GitTools.IssueTrackers/Models/Issue.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public Issue(string id)
1010
Id = id;
1111

1212
FixVersions = new List<Version>();
13-
Contributors = new List<Contributor>();
13+
Contributors = new Contributor[0];
1414
}
1515

1616
public string Id { get; private set; }
@@ -33,6 +33,6 @@ public Issue(string id)
3333

3434
//public Uri HtmlUrl { get; set; }
3535

36-
public List<Contributor> Contributors { get; set; }
36+
public Contributor[] Contributors { get; set; }
3737
}
3838
}

0 commit comments

Comments
 (0)