diff options
Diffstat (limited to 'src')
3 files changed, 66 insertions, 2 deletions
diff --git a/src/main/java/edu/brown/cs/student/term/Main.java b/src/main/java/edu/brown/cs/student/term/Main.java index dd304c5..7b9bf0f 100644 --- a/src/main/java/edu/brown/cs/student/term/Main.java +++ b/src/main/java/edu/brown/cs/student/term/Main.java @@ -2,6 +2,7 @@ package edu.brown.cs.student.term; import com.google.common.collect.ImmutableMap; import edu.brown.cs.student.term.hub.Holder; +import edu.brown.cs.student.term.hub.LinkMapper; import edu.brown.cs.student.term.profit.ProfitCalculation; import edu.brown.cs.student.term.profit.StockHolding; import edu.brown.cs.student.term.hub.SuspicionRanker; @@ -137,6 +138,7 @@ public final class Main { Spark.post("/data", new SuspicionRankHandler()); Spark.post("/profit", new ProfitQueryHandler()); Spark.post("/trade-lookup", new TradeQueryHandler()); + Spark.post("/edge-data", new EdgeDataQueryHandler()); } /** @@ -217,6 +219,18 @@ public final class Main { } } + private static class EdgeDataQueryHandler implements Route { + @Override + public Object handle(Request request, Response response) throws Exception { + JSONObject req = new JSONObject(request.body()); + int leaderID = req.getInt("leaderID"); + int followerID = req.getInt("followerID"); + List<String> commonStocks = LinkMapper.getCommonTrades(leaderID, followerID); + System.out.println(commonStocks); + return GSON.toJson(commonStocks); + } + } + /** * Display an error page when an exception occurs in the server. */ diff --git a/src/main/java/edu/brown/cs/student/term/hub/LinkMapper.java b/src/main/java/edu/brown/cs/student/term/hub/LinkMapper.java index 31e2625..e749aff 100644 --- a/src/main/java/edu/brown/cs/student/term/hub/LinkMapper.java +++ b/src/main/java/edu/brown/cs/student/term/hub/LinkMapper.java @@ -11,8 +11,9 @@ public class LinkMapper { //TODO: Review what we actually need in here //not strictly necessary but may be nice to maintain - private List<List<Trade>> allTrades = new ArrayList<>(); + //private List<List<Trade>> allTrades = new ArrayList<>(); private Map<Holder, Set<Holder>> followerToLeaders = new HashMap<>(); + private static Map<Integer, Set<Trade>> holderIDToTrades = new HashMap<>(); private DatabaseQuerier databaseQuerier; public LinkMapper(DatabaseQuerier db){ @@ -55,6 +56,25 @@ public class LinkMapper { return followerToLeaders; } + public static List<String> getCommonTrades(int leaderID, int followerID){ + Set<Trade> leaderTrades = new HashSet<>(holderIDToTrades.get(leaderID)); + Set<Trade> followerTrades = new HashSet<>(holderIDToTrades.get(followerID)); + + leaderTrades.retainAll(followerTrades); + //TODO: Could retain WAY more info in here! + List<String> commonTrades = new ArrayList<>(); + for(Trade leaderTrade: leaderTrades){ + String buyType = ""; + if(leaderTrade.isBuy()){ + buyType = "Buy"; + } else{ + buyType = "Sell"; + } + commonTrades.add(buyType + ": " + leaderTrade.getStock()); + } + return commonTrades; + } + /** * Converts a single trade list into entries in the follower to leader map * @param tradeList - a list of trades for a single stock (either buy or sell) @@ -64,7 +84,15 @@ public class LinkMapper { //gets in order list of people for (Trade trade : tradeList) { - holderList.add(trade.getHolder()); + Holder currentHolder = trade.getHolder(); + holderList.add(currentHolder); + if(!holderIDToTrades.containsKey(currentHolder.getId())){ + Set<Trade> tradeSet = new HashSet<>(); + tradeSet.add(trade); + holderIDToTrades.put(currentHolder.getId(), tradeSet); + } else { + holderIDToTrades.get(currentHolder.getId()).add(trade); + } } //Set<Holder> followers = new HashSet<>(holderList); diff --git a/src/main/java/edu/brown/cs/student/term/trade/Trade.java b/src/main/java/edu/brown/cs/student/term/trade/Trade.java index 353de8d..df52a4f 100644 --- a/src/main/java/edu/brown/cs/student/term/trade/Trade.java +++ b/src/main/java/edu/brown/cs/student/term/trade/Trade.java @@ -2,6 +2,8 @@ package edu.brown.cs.student.term.trade; import edu.brown.cs.student.term.hub.Holder; +import java.util.Objects; + public class Trade { private int id; @@ -54,6 +56,26 @@ public class Trade { return price; } + /** + * This equals method differs from what may be expected, + * it considers trades "equal" if they have the same buy value and stock name + * because they are the same type of trade of the same stock in that case + * @param o - object to compare to + * @return true if equal by the considerations above + */ + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Trade trade = (Trade) o; + return isBuy == trade.isBuy && stock.equals(trade.stock); + } + + @Override + public int hashCode() { + return Objects.hash(stock, isBuy); + } + @Override public String toString() { return "Trade{" + |