had to prune?

1 files changed, 23 insertions, 0 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 97f4425..b61d80f 100644
--- a/src/main/java/edu/brown/cs/student/term/Main.java
+++ b/src/main/java/edu/brown/cs/student/term/Main.java
@@ -117,7 +117,12 @@ public final class Main {
           return "OK";
         });
     Spark.before((request, response) -> response.header("Access-Control-Allow-Origin", "*"));
+<<<<<<< HEAD
     Spark.post("/data", new SuspicionRankHandler());
+=======
+    Spark.post("/data", new DataHandler());
+    Spark.post("/profit", new ProfitQueryHandler());
+>>>>>>> 73ad5303d59cd93a115401b1bac4aad87dfb1cb7
   }
 
   /**
@@ -152,6 +157,24 @@ public final class Main {
     }
   }
 
+  private static class ProfitQueryHandler implements Route {
+    @Override
+    public Object handle(Request request, Response response) throws Exception {
+      JSONObject req = new JSONObject(request.body());
+      String person = req.getString("person");
+      Date startPeriod = new Date(req.getLong("startDate"));
+      Date endPeriod = new Date(req.getLong("endDate"));
+
+      try {
+        DatabaseQuerier db = new DatabaseQuerier("data/trades.sqlite3");
+        new ProfitCalculation(DatabaseQuerier.getConn(), "person", startPeriod, endPeriod);
+      } catch (Exception e) {
+        System.out.println("DBQuerier Test, couldn't connect to db???");
+        return "Error";
+      }
+    }
+  }
+
   /**
    * Display an error page when an exception occurs in the server.
    */