diff options
| -rw-r--r-- | src/main/java/edu/brown/cs/student/term/Main.java | 22 |
1 files changed, 6 insertions, 16 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 4238f67..c854940 100644 --- a/src/main/java/edu/brown/cs/student/term/Main.java +++ b/src/main/java/edu/brown/cs/student/term/Main.java @@ -71,7 +71,7 @@ public final class Main { runSparkServer((int) options.valueOf("port")); //will auto connect to correct db when running gui! SetupCommand setConnection = new SetupCommand(); - setConnection.run(new String[]{"data/trades.sqlite3"}); + setConnection.run(new String[] {"data/trades.sqlite3"}); } HashMap<String, Command> commandHashMap = new HashMap<>(); @@ -165,21 +165,11 @@ public final class Main { Date startPeriod = new Date(req.getLong("startTime")); Date endPeriod = new Date(req.getLong("endTime")); - List<StockHolding> holdings = new LinkedList<>(); - ProfitCalculation profit; - double gains = 0.0; - double sp500PercentGain = 0.0; - double sp500Gain = 0.0; - try { - profit = - new ProfitCalculation(DatabaseQuerier.getConn(), person, startPeriod, endPeriod); - holdings = profit.getHoldingsList(); - gains = profit.calculateGains(); - sp500PercentGain = profit.compareToSP500(); - } catch (Exception e) { - System.out.println("DBQuerier Test, couldn't connect to db???"); - return "Error"; - } + ProfitCalculation profit = + new ProfitCalculation(DatabaseQuerier.getConn(), person, startPeriod, endPeriod); + List<StockHolding> holdings = profit.getHoldingsList(); + double gains = profit.calculateGains(); + double sp500PercentGain = profit.compareToSP500(); Map<String, Object> res = new HashMap(); res.put("person", person); |