aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/edu/brown/cs/student/term/Main.java3
-rw-r--r--src/main/java/edu/brown/cs/student/term/profit/StockHolding.java35
2 files changed, 37 insertions, 1 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 d6948cd..6ba2393 100644
--- a/src/main/java/edu/brown/cs/student/term/Main.java
+++ b/src/main/java/edu/brown/cs/student/term/Main.java
@@ -178,6 +178,7 @@ public final class Main {
@Override
public Object handle(Request request, Response response) throws Exception {
JSONObject req = new JSONObject(request.body());
+ 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"));
@@ -196,6 +197,7 @@ public final class Main {
res.put("percentGain", 100 * (gains / profit.getMoneyInput()));
res.put("SP500", (1 + sp500PercentGain) * profit.getMoneyInput());
res.put("percentSP500", 100 * sp500PercentGain);
+ System.err.println("LOG: Returning to GUI " + res);
return GSON.toJson(res);
}
@@ -213,7 +215,6 @@ public final class Main {
List<Trade> trades = db.getAllTradesByHolder(holder_id, startPeriod, endPeriod);
return GSON.toJson(trades);
-
}
}
diff --git a/src/main/java/edu/brown/cs/student/term/profit/StockHolding.java b/src/main/java/edu/brown/cs/student/term/profit/StockHolding.java
index 5edb5f7..dd57ce1 100644
--- a/src/main/java/edu/brown/cs/student/term/profit/StockHolding.java
+++ b/src/main/java/edu/brown/cs/student/term/profit/StockHolding.java
@@ -1,5 +1,7 @@
package edu.brown.cs.student.term.profit;
+import java.util.Objects;
+
/**
* class to map holding info for JSON.
*/
@@ -46,4 +48,37 @@ public class StockHolding {
public int getShares() {
return shares;
}
+
+ public String getTicker() {
+ return ticker;
+ }
+
+ @Override
+ public String toString() {
+ return "StockHolding{" +
+ "ticker='" + ticker + '\'' +
+ ", realizedGain=" + realizedGain +
+ ", unrealizedGain=" + unrealizedGain +
+ ", shares=" + shares +
+ '}';
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ StockHolding that = (StockHolding) o;
+ return shares == that.shares && Objects.equals(ticker, that.ticker) &&
+ Objects.equals(realizedGain, that.realizedGain) &&
+ Objects.equals(unrealizedGain, that.unrealizedGain);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(ticker, realizedGain, unrealizedGain, shares);
+ }
} \ No newline at end of file