Skip to content

Commit

Permalink
Fix NullReferenceException on GET Users/Packages by including Package…
Browse files Browse the repository at this point in the history
…Registration in queries to retrieve PackageOwnershipRequest (#4882)
  • Loading branch information
xavierdecoster committed Oct 23, 2017
1 parent c591f15 commit 5e44c07
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 16 deletions.
3 changes: 2 additions & 1 deletion src/NuGetGallery/Services/PackageOwnerRequestService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System;
using System.Collections.Generic;
using System.Data.Entity;
using System.Linq;
using System.Threading.Tasks;

Expand Down Expand Up @@ -45,7 +46,7 @@ public PackageOwnerRequest GetPackageOwnershipRequest(PackageRegistration packag

public IEnumerable<PackageOwnerRequest> GetPackageOwnershipRequests(PackageRegistration package = null, User requestingOwner = null, User newOwner = null)
{
var query = _packageOwnerRequestRepository.GetAll();
var query = _packageOwnerRequestRepository.GetAll().Include(e => e.PackageRegistration);

if (package != null)
{
Expand Down
13 changes: 4 additions & 9 deletions src/NuGetGallery/ViewModels/OwnerRequestsListItemViewModel.cs
Original file line number Diff line number Diff line change
@@ -1,23 +1,18 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;

namespace NuGetGallery
{
public class OwnerRequestsListItemViewModel
{
public PackageOwnerRequest Request { get; }

public Package Package { get; }

public OwnerRequestsListItemViewModel(PackageOwnerRequest request, IPackageService packageService)
{
Request = request;
Package = packageService.FindPackageByIdAndVersion(request.PackageRegistration.Id, version: null, semVerLevelKey: SemVerLevelKey.SemVer2, allowPrerelease: true);
}

public PackageOwnerRequest Request { get; }

public Package Package { get; }
}
}
12 changes: 6 additions & 6 deletions src/NuGetGallery/ViewModels/OwnerRequestsListViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ namespace NuGetGallery
{
public class OwnerRequestsListViewModel
{
public IEnumerable<OwnerRequestsListItemViewModel> RequestItems { get; }

public string Name { get; }

public User CurrentUser { get; }

public OwnerRequestsListViewModel(IEnumerable<PackageOwnerRequest> requests, string name, User currentUser, IPackageService packageService)
{
RequestItems = requests.Select(r => new OwnerRequestsListItemViewModel(r, packageService)).ToArray();
Name = name;
CurrentUser = currentUser;
}

public IEnumerable<OwnerRequestsListItemViewModel> RequestItems { get; }

public string Name { get; }

public User CurrentUser { get; }
}
}

0 comments on commit 5e44c07

Please sign in to comment.