1 files changed, 30 insertions, 10 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 ee3bec1..37317c6 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;
@@ -78,12 +79,12 @@ public final class Main {
       setConnection.run(new String[] {"data/trades.sqlite3"});
     }
 
-    if (!options.has("debug")) {
+    /*if (!options.has("debug")) {
       System.setErr(new PrintStream(new OutputStream() {
         public void write(int b) {
         }
       }));
-    }
+    }*/
 
 
     HashMap<String, Command> commandHashMap = new HashMap<>();
@@ -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());
   }
 
   /**
@@ -178,24 +180,31 @@ public final class Main {
     @Override
     public Object handle(Request request, Response response) throws Exception {
       JSONObject req = new JSONObject(request.body());
-      String person = req.getString("person");
+      System.err.println("LOG: Call to /profit with " + req.toMap());
+      Integer holder_id = req.getInt("selectedId");
       Date startPeriod = new Date(req.getLong("startTime"));
       Date endPeriod = new Date(req.getLong("endTime"));
 
       ProfitCalculation profit =
-        new ProfitCalculation(DatabaseQuerier.getConn(), person, startPeriod, endPeriod);
-      List<StockHolding> holdings = profit.getHoldingsList();
-      double gains = profit.calculateGains();
+        new ProfitCalculation(DatabaseQuerier.getConn(), "", startPeriod, endPeriod);
+      List<StockHolding> holdings = profit.getHoldingsList(holder_id);
+      double gains = profit.calculateGainsSingle(holder_id);
       double sp500PercentGain = profit.compareToSP500();
 
+      double percentGain = 100 * (gains / profit.getMoneyInput());
+      if (profit.getMoneyInput() == 0) {
+        percentGain = 0;
+      }
+
       Map<String, Object> res = new HashMap<>();
-      res.put("person", person);
+      res.put("holder_id", holder_id);
       res.put("moneyIn", profit.getMoneyInput());
       res.put("moneyOut", profit.getMoneyInput() + gains);
       res.put("holdings", holdings);
-      res.put("percentGain", 100 * gains / profit.getMoneyInput());
+      res.put("percentGain", percentGain);
       res.put("SP500", (1 + sp500PercentGain) * profit.getMoneyInput());
       res.put("percentSP500", 100 * sp500PercentGain);
+      System.err.println("LOG: Returning to GUI " + res);
       return GSON.toJson(res);
     }
 
@@ -205,15 +214,26 @@ public final class Main {
     @Override
     public Object handle(Request request, Response response) throws Exception {
       JSONObject req = new JSONObject(request.body());
-      String person = req.getString("person");
+      Integer holder_id = req.getInt("selectedId");
       Date startPeriod = new Date(req.getLong("startTime"));
       Date endPeriod = new Date(req.getLong("endTime"));
 
       DatabaseQuerier db = SetupCommand.getDq();
-      List<Trade> trades = db.getAllTradesByHolder(person, startPeriod, endPeriod);
+      List<Trade> trades = db.getAllTradesByHolder(holder_id, startPeriod, endPeriod);
 
       return GSON.toJson(trades);
+    }
+  }
 
+  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);
     }
   }