Skip to content

WIP: Search paging #596

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

Open
j-rewerts wants to merge 5 commits into
base: master
Choose a base branch
from
Open

WIP: Search paging #596

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3bda28a
Added paged results to search tests.
j-rewerts Oct 22, 2019
fb4cc02
Assert the exact response length of all search tests.
j-rewerts Oct 22, 2019
cd8c27f
Fixed error handling.
j-rewerts Oct 22, 2019
5718843
Fixed duplicate params when paging.
j-rewerts Oct 22, 2019
8b54caf
Added single page search.
j-rewerts Oct 22, 2019
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
Prev Previous commit
Next Next commit
Fixed duplicate params when paging.
  • Loading branch information
@j-rewerts
j-rewerts committed Oct 22, 2019
commit 5718843977177673683d3273d588ac46f3e23869
4 changes: 3 additions & 1 deletion lib/Requestable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ class Requestable {
}
results.push(...thisGroup);

const nextUrl = getNextPage(response.headers.link);
let nextUrl = getNextPage(response.headers.link);
if(nextUrl) {
if (!options) {
options = {};
Expand All @@ -266,6 +266,8 @@ class Requestable {
.split('=')
.pop()
);
// Strip out query string, as we'll use 'options'.
nextUrl = nextUrl.split('?', 1)[0];
if (!(options && typeof options.page !== 'number')) {
log(`getting next page: ${nextUrl}`);
return this._requestAllPages(nextUrl, options, cb, results);
Expand Down
10 changes: 5 additions & 5 deletions test/fixtures/search.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8939,7 +8939,7 @@
{
"scope": "https://api.github.com:443",
"method": "GET",
"path": "/search/repositories?q=tetris+language%3Aassembly&sort=stars&order=desc&type=all&per_page=100&page=2&q=tetris+language:assembly&sort=stars&order=desc&type=all&per_page=100&page=2",
"path": "/search/repositories?q=tetris+language:assembly&sort=stars&order=desc&type=all&per_page=100&page=2",
"body": "",
"status": 200,
"response": {
Expand Down Expand Up @@ -17876,7 +17876,7 @@
{
"scope": "https://api.github.com:443",
"method": "GET",
"path": "/search/repositories?q=tetris+language%3Aassembly&sort=stars&order=desc&type=all&per_page=100&page=3&q=tetris+language:assembly&sort=stars&order=desc&type=all&per_page=100&page=3",
"path": "/search/repositories?q=tetris+language:assembly&sort=stars&order=desc&type=all&per_page=100&page=3",
"body": "",
"status": 200,
"response": {
Expand Down Expand Up @@ -26813,7 +26813,7 @@
{
"scope": "https://api.github.com:443",
"method": "GET",
"path": "/search/repositories?q=tetris+language%3Aassembly&sort=stars&order=desc&type=all&per_page=100&page=4&q=tetris+language:assembly&sort=stars&order=desc&type=all&per_page=100&page=4",
"path": "/search/repositories?q=tetris+language:assembly&sort=stars&order=desc&type=all&per_page=100&page=4",
"body": "",
"status": 200,
"response": {
Expand Down Expand Up @@ -35750,7 +35750,7 @@
{
"scope": "https://api.github.com:443",
"method": "GET",
"path": "/search/repositories?q=tetris+language%3Aassembly&sort=stars&order=desc&type=all&per_page=100&page=5&q=tetris+language:assembly&sort=stars&order=desc&type=all&per_page=100&page=5",
"path": "/search/repositories?q=tetris+language:assembly&sort=stars&order=desc&type=all&per_page=100&page=5",
"body": "",
"status": 200,
"response": {
Expand Down Expand Up @@ -48946,7 +48946,7 @@
{
"scope": "https://api.github.com:443",
"method": "GET",
"path": "/search/issues?q=windows+pip+label%3Abug+language%3Apython+state%3Aopen+&sort=created&order=asc&type=all&per_page=100&page=2&q=windows+pip+label:bug+language:python+state:open+&sort=created&order=asc&type=all&per_page=100&page=2",
"path": "/search/issues?q=windows+pip+label:bug+language:python+state:open+&sort=created&order=asc&type=all&per_page=100&page=2",
"body": "",
"status": 200,
"response": {
Expand Down