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.

Sign up for GitHub

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

add top parameter when getOnlyLatest is true #1472

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

add top parameter when getOnlyLatest is true #1472

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
415d042
add top parameter when getOnlyLatest is true
anamnavi Nov 6, 2023
59fd881
fix version range max having a 9 added when the version range reflect…
anamnavi Nov 6, 2023
8e3a2eb
remove console writeline statement
anamnavi Nov 6, 2023
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
77 changes: 43 additions & 34 deletions src/code/V2ServerAPICalls.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1040,45 +1040,53 @@ private string FindVersionGlobbing(string packageName, VersionRange versionRange
string format = "NormalizedVersion {0} {1}";
string minPart = String.Empty;
string maxPart = String.Empty;
string versionFilterParts = String.Empty;

if (versionRange.MinVersion != null)
if (versionRange.MinVersion != null && versionRange.MaxVersion != null && versionRange.MinVersion.ToNormalizedString().Equals(versionRange.MaxVersion.ToNormalizedString()))
{
string operation = versionRange.IsMinInclusive ? "ge" : "gt";
minPart = String.Format(format, operation, $"'{versionRange.MinVersion.ToNormalizedString()}'");
// for dependency packages, the version range may look like: [1.2.0, 1.2.0] which is actually a required version. We don't want MaxVersion +9 code to be hit and mess up this range
string requiredVersionPart = String.Format(format, "eq", $"'{versionRange.MinVersion.ToNormalizedString()}'");
versionFilterParts = requiredVersionPart;
}

if (versionRange.MaxVersion != null)
{
string operation = versionRange.IsMaxInclusive ? "le" : "lt";
// Adding '9' as a digit to the end of the patch portion of the version
// because we want to retrieve all the prerelease versions for the upper end of the range
// and PSGallery views prerelease as higher than its stable.
// eg 3.0.0-prerelease > 3.0.0
// If looking for versions within '[1.9.9,1.9.9]' including prerelease values, this will change it to search for '[1.9.9,1.9.99]'
// and find any pkg versions that are 1.9.9-prerelease.
string maxString = includePrerelease ? $"{versionRange.MaxVersion.Major}.{versionRange.MaxVersion.Minor}.{versionRange.MaxVersion.Patch.ToString() + "9"}" :
$"{versionRange.MaxVersion.ToNormalizedString()}";
if (NuGetVersion.TryParse(maxString, out NuGetVersion maxVersion))
else {
if (versionRange.MinVersion != null)
{
maxPart = String.Format(format, operation, $"'{maxVersion.ToNormalizedString()}'");
string operation = versionRange.IsMinInclusive ? "ge" : "gt";
minPart = String.Format(format, operation, $"'{versionRange.MinVersion.ToNormalizedString()}'");
}
else {
maxPart = String.Format(format, operation, $"'{versionRange.MaxVersion.ToNormalizedString()}'");

if (versionRange.MaxVersion != null)
{
string operation = versionRange.IsMaxInclusive ? "le" : "lt";
// Adding '9' as a digit to the end of the patch portion of the version
// because we want to retrieve all the prerelease versions for the upper end of the range
// and PSGallery views prerelease as higher than its stable.
// eg 3.0.0-prerelease > 3.0.0
// If looking for versions within '[1.9.9,1.9.9]' including prerelease values, this will change it to search for '[1.9.9,1.9.99]'
// and find any pkg versions that are 1.9.9-prerelease.
string maxString = includePrerelease ? $"{versionRange.MaxVersion.Major}.{versionRange.MaxVersion.Minor}.{versionRange.MaxVersion.Patch.ToString() + "9"}" :
$"{versionRange.MaxVersion.ToNormalizedString()}";
if (NuGetVersion.TryParse(maxString, out NuGetVersion maxVersion))
{
maxPart = String.Format(format, operation, $"'{maxVersion.ToNormalizedString()}'");
}
else {
maxPart = String.Format(format, operation, $"'{versionRange.MaxVersion.ToNormalizedString()}'");
}
}
}

string versionFilterParts = String.Empty;
if (!String.IsNullOrEmpty(minPart) && !String.IsNullOrEmpty(maxPart))
{
versionFilterParts += minPart + " and " + maxPart;
}
else if (!String.IsNullOrEmpty(minPart))
{
versionFilterParts += minPart;
}
else if (!String.IsNullOrEmpty(maxPart))
{
versionFilterParts += maxPart;
if (!String.IsNullOrEmpty(minPart) && !String.IsNullOrEmpty(maxPart))
{
versionFilterParts += minPart + " and " + maxPart;
}
else if (!String.IsNullOrEmpty(minPart))
{
versionFilterParts += minPart;
}
else if (!String.IsNullOrEmpty(maxPart))
{
versionFilterParts += maxPart;
}
}

string filterQuery = "&$filter=";
Expand All @@ -1093,6 +1101,8 @@ private string FindVersionGlobbing(string packageName, VersionRange versionRange
string idFilterPart = $"{joiningOperator}";
idFilterPart += _isJFrogRepo ? "" : $"Id eq '{packageName}'";
filterQuery += idFilterPart;
// since unlisted versions can be returned and this can influence getOnlyLatest $top = 1 determined later, disallow unlisted versions
filterQuery += $"{andOperator}year(Published) gt 1900";
filterQuery += type == ResourceType.Script ? $"{andOperator}substringof('PS{type.ToString()}', Tags) eq true" : String.Empty;

if (!String.IsNullOrEmpty(versionFilterParts))
Expand All @@ -1104,11 +1114,10 @@ private string FindVersionGlobbing(string packageName, VersionRange versionRange
filterQuery += $"{andOperator}{versionFilterParts}";
}

string paginationParam = $"$inlinecount=allpages&$skip={skip}";
string paginationParam = getOnlyLatest ? $"$inlinecount=allpages&$skip={skip}&$top=1" : $"$inlinecount=allpages&$skip={skip}";

filterQuery = filterQuery.EndsWith("=") ? string.Empty : filterQuery;
var requestUrlV2 = $"{Repository.Uri}/FindPackagesById()?id='{packageName}'&$orderby=NormalizedVersion desc&{paginationParam}{filterQuery}";

return HttpRequestCall(requestUrlV2, out errRecord);
}

Expand Down
Loading