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

Handle timestamp=no in volumes #7

Merged
merged 1 commit into from
Nov 2, 2019
Merged

Handle timestamp=no in volumes #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 19 additions & 6 deletions src/main/java/bisq/markets/api/GraphQLQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,7 @@ public Object translateResponse(String response) {
return tickers;
}
Map<String,Ticker> ret = new HashMap<>();
Iterator<Ticker> iter = tickers.iterator();
while(iter.hasNext()) {
Ticker ticker = iter.next();
for (Ticker ticker : tickers) {
ret.put(ticker.market, ticker);
}
return ret;
Expand Down Expand Up @@ -280,13 +278,14 @@ public Object translateResponse(String response) {
private static class VolumesQuery extends GraphQLQuery {
private static class Volume {
long period_start;
String periodStartDateTime;
String volume;
int num_trades;
}
private static final String volumeQuery = "query Volumes($market: MarketPair "+
"$interval: Interval) { " +
"volumes(market: $market interval: $interval) " +
"{ period_start: periodStart volume: formattedVolume num_trades: numTrades } }";
"{ period_start: periodStart periodStartDateTime volume: formattedVolume num_trades: numTrades } }";
private final String query = volumeQuery;

private final Map<String,String> variables;
Expand All @@ -301,8 +300,22 @@ private static class Volume {

@Override
public Object translateResponse(String response) {
GraphQLResponse<List<Volume>> ret = gson.fromJson(response,new TypeToken<GraphQLResponse<List<Volume>>>(){}.getType());
return ret.getData();
GraphQLResponse<List<Volume>> res = gson.fromJson(response,new TypeToken<GraphQLResponse<List<Volume>>>(){}.getType());
List<Map<String,Object>> ret = new ArrayList<>();
for (Volume volume : res.getData()) {
Map<String,Object> v = new HashMap<>();
String timestamp = variables.get("timestamp");
if (timestamp != null && timestamp.equals("no")) {
v.put("period_start", volume.periodStartDateTime);
} else {
v.put("period_start", volume.period_start);
}
v.put("num_trades", volume.num_trades);
v.put("volume", volume.volume);
ret.add(v);
}

return ret;
}
}
}