Have a good working canvas now by limiting the results shown.

1 files changed, 19 insertions, 5 deletions

diff --git a/src/main/java/edu/brown/cs/student/term/DatabaseQuerier.java b/src/main/java/edu/brown/cs/student/term/DatabaseQuerier.java
index 4ff02f9..53c8cdc 100644
--- a/src/main/java/edu/brown/cs/student/term/DatabaseQuerier.java
+++ b/src/main/java/edu/brown/cs/student/term/DatabaseQuerier.java
@@ -53,8 +53,8 @@ public class DatabaseQuerier {
     ResultSet rs = prep.executeQuery();
 
     while (rs.next()) {
-      String ticker = rs.getString(1);
-      if (isValidTicker(ticker)) {
+      String ticker = validateTicker(rs.getString(1));
+      if (!ticker.equals("")) {
         stocks.add(ticker);
       }
     }
@@ -97,9 +97,10 @@ public class DatabaseQuerier {
   public List<Trade> getTradeByStock(String stock, int isBuy, Instant startDate, Instant endDate)
       throws SQLException {
     List<Trade> trades = new ArrayList<>();
+    /*
     if (isValidStock(stock)) {
       return trades;
-    }
+    }*/
 
     PreparedStatement prep = conn.prepareStatement(
         "SELECT * FROM trades WHERE (stock_name = ? AND is_buy = ?) "
@@ -140,14 +141,14 @@ public class DatabaseQuerier {
 
       while (rs.next()) {
         String ticker = rs.getString("stock_name");
-        if (isValidTicker(ticker)) {
+        //if (isValidTicker(ticker)) {
           trades.addFirst(new Trade(rs.getInt("trade_id"), ticker,
               rs.getDouble("trade_timestamp"),
               rs.getInt("is_buy"),
               rs.getInt("number_of_shares"),
               new Holder(rs.getInt("holder_id"), rs.getString("holder_name")),
               rs.getDouble("share_price")));
-        }
+        //}
       }
       prep.close();
     } catch (SQLException e) {
@@ -155,4 +156,17 @@ public class DatabaseQuerier {
     }
     return trades;
   }
+
+  private String validateTicker(String ticker) {
+    //this is cleaning some improperly formatted tickers
+    ticker = ticker.replaceAll("[^a-zA-Z0-9]", "").toUpperCase();
+    if(ticker.contains("[0-9]") ||
+        ticker.length() > 5 ||
+        ticker.length() < 2 ||
+        ticker.contains("NONE")) {
+      return "";
+    }
+
+    return ticker;
+  }
 }