Skip to content

use pagination for version downloads #611

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

Merged
merged 4 commits into from
Mar 13, 2017
Merged

use pagination for version downloads #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8bc9f7e
use pagination for version downloads
Eh2406 Mar 10, 2017
0fc072c
use before_date for version downloads
Eh2406 Mar 13, 2017
6af3460
BETWEEN in sql
Eh2406 Mar 13, 2017
890a475
Add test for before_date for version downloads
Eh2406 Mar 13, 2017
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
16 changes: 16 additions & 0 deletions src/tests/krate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,6 +677,7 @@ fn summary_doesnt_die() {

#[test]
fn download() {
use ::time::{Duration, now_utc, strftime};
let (_b, app, middle) = ::app();
let mut req = ::req(app, Method::Get, "/api/v1/crates/foo_download/1.0.0/download");
::mock_user(&mut req, ::user("foo"));
Expand All @@ -697,6 +698,21 @@ fn download() {
let mut resp = ok_resp!(middle.call(&mut req));
let downloads = ::json::<Downloads>(&mut resp);
assert_eq!(downloads.version_downloads.len(), 1);

let yesterday = now_utc() + Duration::days(-1);
req.with_path("/api/v1/crates/FOO_DOWNLOAD/1.0.0/downloads");
req.with_query(&("before_date=".to_string() + &strftime("%Y-%m-%d", &yesterday).unwrap()));
let mut resp = ok_resp!(middle.call(&mut req));
let downloads = ::json::<Downloads>(&mut resp);
assert_eq!(downloads.version_downloads.len(), 0);

let tomorrow = now_utc() + Duration::days(1);
req.with_path("/api/v1/crates/FOO_DOWNLOAD/1.0.0/downloads");
req.with_query(&("before_date=".to_string() + &strftime("%Y-%m-%d", &tomorrow).unwrap()));
let mut resp = ok_resp!(middle.call(&mut req));
let downloads = ::json::<Downloads>(&mut resp);
assert_eq!(downloads.version_downloads.len(), 1);

}

#[test]
Expand Down
15 changes: 8 additions & 7 deletions src/version.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ use pg::GenericConnection;
use pg::rows::Row;
use rustc_serialize::json;
use semver;
use time::Duration;
use time::Timespec;
use time::{Duration, Timespec, now_utc, strptime};
use url;

use {Model, Crate};
Expand Down Expand Up @@ -301,15 +300,17 @@ pub fn dependencies(req: &mut Request) -> CargoResult<Response> {
/// Handles the `GET /crates/:crate_id/:version/downloads` route.
pub fn downloads(req: &mut Request) -> CargoResult<Response> {
let (version, _) = version_and_crate(req)?;
let cutoff_end_date = req.query().get("before_date")
.and_then(|d| strptime(d, "%Y-%m-%d").ok())
.unwrap_or(now_utc()).to_timespec();
let cutoff_start_date = cutoff_end_date + Duration::days(-89);

let tx = req.tx()?;
let cutoff_date = ::now() + Duration::days(-90);
let stmt = tx.prepare("SELECT * FROM version_downloads
WHERE date > $1 AND version_id = $2
WHERE date BETWEEN $1 AND $2 AND version_id = $3
ORDER BY date ASC")?;
let downloads = stmt.query(&[&cutoff_date, &version.id])?.iter().map(|row| {
VersionDownload::from_row(&row).encodable()
}).collect();
let downloads = stmt.query(&[&cutoff_start_date, &cutoff_end_date, &version.id])?
.iter().map(|row| VersionDownload::from_row(&row).encodable()).collect();

#[derive(RustcEncodable)]
struct R { version_downloads: Vec<EncodableVersionDownload> }
Expand Down