Skip to content

Commit

Permalink
rename all Latest -> Last
Browse files Browse the repository at this point in the history
  • Loading branch information
sbeam committed Nov 15, 2022
1 parent cb39dd0 commit 4e424a8
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions examples/latest-quote-and-trade.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (C) 2020-2022 The apca Developers
// SPDX-License-Identifier: GPL-3.0-or-later

use apca::data::v2::{last_quote, latest_trade};
use apca::data::v2::{last_quote, last_trade};
use apca::ApiInfo;
use apca::Client;

Expand All @@ -26,8 +26,8 @@ async fn main() {
)
});

let trade_req = latest_trade::LatestTradeRequest::new("SPY,QQQ,MSFT");
let trades = client.issue::<latest_trade::Get>(&trade_req).await.unwrap();
let trade_req = last_trade::LastTradeRequest::new("SPY,QQQ,MSFT");
let trades = client.issue::<last_trade::Get>(&trade_req).await.unwrap();
trades.iter().for_each(|trade| {
println!(
"Latest trade for {}: {} @ {}",
Expand Down
22 changes: 11 additions & 11 deletions src/data/v2/latest_trade.rs → src/data/v2/last_trade.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ use crate::Str;

/// A GET request to be made to the /v2/stocks/{symbol}/trades/latest endpoint.
#[derive(Clone, Serialize, PartialEq, Debug)]
pub struct LatestTradeRequest {
pub struct LastTradeRequest {
/// Symbols to retrieve the last trade for, comma separated.
pub symbols: String,
/// The data feed to use.
pub feed: Option<Feed>,
}

impl LatestTradeRequest {
/// Create a new LatestTradeRequest.
impl LastTradeRequest {
/// Create a new LastTradeRequest.
pub fn new<S>(symbols: S) -> Self
where
S: Into<String>,
Expand Down Expand Up @@ -57,7 +57,7 @@ pub struct Trade {
}

impl<'a> HistoricalData<'a> for Trade {
type Response = LatestTradeResponse;
type Response = LastTradeResponse;
type Point = TradeDataPoint;

fn from_point(symbol: &str, point: &Self::Point) -> Self {
Expand All @@ -80,11 +80,11 @@ pub struct TradeDataPoint {

/// A representation of the JSON data in the response
#[derive(Debug, Deserialize)]
pub struct LatestTradeResponse {
pub struct LastTradeResponse {
trades: HashMap<String, TradeDataPoint>,
}

impl HistoricalDataResponse<TradeDataPoint> for LatestTradeResponse {
impl HistoricalDataResponse<TradeDataPoint> for LastTradeResponse {
fn items<'de>(&self) -> &HashMap<String, TradeDataPoint>
where
Self: 'de,
Expand All @@ -96,7 +96,7 @@ impl HistoricalDataResponse<TradeDataPoint> for LatestTradeResponse {
EndpointNoParse! {
/// The representation of a GET request to the
/// /v2/stocks/trades/latest endpoint.
pub Get(LatestTradeRequest),
pub Get(LastTradeRequest),
Ok => Vec<Trade>, [
/// The last Trade was retrieved successfully.
/* 200 */ OK,
Expand Down Expand Up @@ -185,7 +185,7 @@ mod tests {
let api_info = ApiInfo::from_env().unwrap();
let client = Client::new(api_info);

let req = LatestTradeRequest::new("SPY");
let req = LastTradeRequest::new("SPY");
let trades = client.issue::<Get>(&req).await.unwrap();
// Just as a rough sanity check, we require that the reported time
// is some time after two weeks before today. That should safely
Expand All @@ -201,7 +201,7 @@ mod tests {
let api_info = ApiInfo::from_env().unwrap();
let client = Client::new(api_info);

let req = LatestTradeRequest::new("SPY,QQQ,MSFT");
let req = LastTradeRequest::new("SPY,QQQ,MSFT");
let trades = client.issue::<Get>(&req).await.unwrap();
assert_eq!(trades.len(), 3);
assert!(trades[0].time >= Utc::now() - Duration::weeks(2));
Expand All @@ -214,7 +214,7 @@ mod tests {
let api_info = ApiInfo::from_env().unwrap();
let client = Client::new(api_info);

let req = LatestTradeRequest {
let req = LastTradeRequest {
symbols: "SPY".to_string(),
feed: Some(Feed::SIP),
};
Expand All @@ -235,7 +235,7 @@ mod tests {
let api_info = ApiInfo::from_env().unwrap();
let client = Client::new(api_info);

let req = LatestTradeRequest::new("BZZZZZZT,AAPL");
let req = LastTradeRequest::new("BZZZZZZT,AAPL");
let trades = client.issue::<Get>(&req).await.unwrap();
assert_eq!(trades.len(), 1);
}
Expand Down
2 changes: 1 addition & 1 deletion src/data/v2/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pub mod bars;
/// Functionality for retrieval of the most recent quote.
pub mod last_quote;
/// Functionality for retrieval of the most recent trade(s).
pub mod latest_trade;
pub mod last_trade;
/// Functionality for retrieving historic quotes.
pub mod quotes;
/// Definitions for real-time streaming of market data.
Expand Down

0 comments on commit 4e424a8

Please sign in to comment.