Apply search filters on database search results#418
Merged
loic-sharma merged 5 commits intoloic-sharma:masterfrom Jan 19, 2020
Merged
Apply search filters on database search results#418loic-sharma merged 5 commits intoloic-sharma:masterfrom
loic-sharma merged 5 commits intoloic-sharma:masterfrom
Conversation
loic-sharma
reviewed
Nov 10, 2019
loic-sharma
reviewed
Nov 10, 2019
|
|
||
| if (!string.IsNullOrEmpty(query)) | ||
| IQueryable<Package> ComposePackageQuery(IQueryable<Package> packageQuery) | ||
| { |
Owner
There was a problem hiding this comment.
We could add packageQuery = packageQuery.Where(p => p.Listed); here.
This lets you simplify line 179 to:
var search = AddSearchFilters(_context.Packages);And lines 237-239 to:
var results = await AddSearchFilters(search).ToListAsync(cancellationToken);
Contributor
Author
There was a problem hiding this comment.
I would like to change/update search before using it. Maybe someone later will add some more lines of code, and I would like to have this filtering in that search already. Please let me know if you agree with it.
loic-sharma
reviewed
Nov 10, 2019
| if (!string.IsNullOrEmpty(query)) | ||
| { | ||
| query = query.ToLower(); | ||
| packageQuery = packageQuery.Where(p => p.Id.ToLower().Contains(query)); |
Owner
There was a problem hiding this comment.
We only need to filter on query once, could you move lines 183-187 out of ComposePackageQuery? I would make line 179 something like:
var search = AddSearchFilters(_context.Packages);
if (!string.IsNullOrEmpty(query))
{
query = query.ToLower();
search = search.Where(p => p.Id.ToLower().Contains(query));
}
var packageIds = ...
Owner
|
Thank you for opening this! I left some minor suggestions, I'll merge this in once you've replied 😊 |
Co-Authored-By: Loïc Sharma <sharma.loic@gmail.com>
Owner
|
Your changes look good. Before I merge this in, I will run the following test plan:
function Push {
param (
$PackageId,
$PackageVersion
)
$normalizedVersion = $PackageVersion.Split('+')[0]
& dotnet pack /p:PackageId=$PackageId /p:PackageVersion=$PackageVersion
& dotnet nuget push "./bin/Debug/${PackageId}.${normalizedVersion}.nupkg" -s http://localhost:50561/v3/index.json
}
Push "normal" "1.0.0"
Push "prerelease" "1.0.0-prerelease"
Push "semver2" "1.0.0+semver2"
Push "both" "1.0.0-prerelease+semver2"
Push "all" "1.0.0"
Push "all" "2.0.0-prerelease"
Push "all" "3.0.0+semver2"
Push "all" "4.0.0-prerelease+semver2" |
loic-sharma
approved these changes
Jan 19, 2020
Owner
|
Thank you for fixing this! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary of the changes (in less than 80 chars)
Addresses #417