cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-25 05:56:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1115 from tgstation/MinorPatch

Browse Source 
Rearrange some code to detect a potential NullReferenceException
This commit is contained in:
Jordan Brown
2020-09-07 12:28:36 -04:00
committed by GitHub
parent 8c47c522f0 873afc6a83
commit aec2124051
1 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Controllers/RepositoryController.cs
+28 -5
View File
@@ -742,11 +742,34 @@ namespace Tgstation.Server.Host.Controllers
foreach (var I in search)
{
revInfoWereLookingFor = dbPull
.Where(x => model.NewTestMerges.Any(z =>
x.PrimaryTestMerge.Number == z.Number
&& x.PrimaryTestMerge.PullRequestRevision.StartsWith(z.PullRequestRevision, StringComparison.Ordinal)
&& (x.PrimaryTestMerge.Comment?.Trim().ToUpperInvariant() == z.Comment?.Trim().ToUpperInvariant() || z.Comment == null))
&& x.ActiveTestMerges.Select(y => y.TestMerge).All(y => appliedTestMergeIds.Contains(y.Id)))
.Where(testRevInfo =>
{
var testMergeMatch = model.NewTestMerges.Any(testTestMerge =>
{
var numberMatch = testRevInfo.PrimaryTestMerge.Number == testTestMerge.Number;
if (!numberMatch)
return false;
var shaMatch = testRevInfo.PrimaryTestMerge.PullRequestRevision.StartsWith(
testTestMerge.PullRequestRevision,
StringComparison.Ordinal);
if (!shaMatch)
return false;
var commentMatch = testRevInfo.PrimaryTestMerge.Comment == testTestMerge.Comment;
return commentMatch;
});
if (!testMergeMatch)
return false;
var previousTestMergesMatch = testRevInfo
.ActiveTestMerges
.Select(previousRevInfoTestMerge => previousRevInfoTestMerge.TestMerge)
.All(previousTestMerge => appliedTestMergeIds.Contains(previousTestMerge.Id));
return previousTestMergesMatch;
})
.FirstOrDefault();
if (revInfoWereLookingFor != null)