Merge pull request #60 from cs130-w21/bug-fix

Bug Fixes pull

Author: elrodrigues

flaskr/__init__.py

@@ -58,7 +58,7 @@ def create_app(test_config=None):
 	"""
 
 	app = Flask(__name__, instance_relative_config=True)
-	finnhub_client = make_client(api_key="sandbox_c0bfrg748v6to0roveg0")
+	finnhub_client = make_client(api_key="c0bfrg748v6to0rovefg")
 
 	# Load config (if it exists) or take a test config
 	if test_config is None:
@@ -113,13 +113,18 @@ def index():
 			stock_symbol = request.form['stock'].upper()
 			volume = request.form['volume']
 			symbol_quote = finnhub_client.quote(stock_symbol)
+			etf_country = finnhub_client.etfs_country_exp(stock_symbol)
 			error = None
 			if not volume.isdigit():
 				error = "Number of Shares must be a positive integer"
 			elif int(volume) < 1:
 				error = "Number of Shares must be a positive integer"
+			elif int(volume) > 1e20:
+				error = "Number of Shares too large"
 			elif symbol_quote['c'] == 0:
 				error = "Invalid stock symbol: {}".format(stock_symbol)
+			elif etf_country['symbol'] != '':
+				error = "Cannot process ETF: {}".format(stock_symbol)
 
 			# TODO: Send form results to DB, fetch all added stocks and display them
 			# Code below uses Flask session to store data which can be moved to

tests/test_index.py

@@ -4,6 +4,7 @@
 TEST_SHARES = '1'
 TEST_STOCK2 = 'AAPL'
 TEST_SHARES2 = '3'
+TEST_ETF = 'VOO'
 ENCODING = 'utf-8'
 
 # run with `pytest`
@@ -36,6 +37,18 @@ def test_index(client):
     assert b"Number of Shares must be a positive integer" in post_response.data
     assert bytes(TEST_STOCK2, encoding=ENCODING) not in post_response.data
 
+    # Add humongous volume
+    post_response = client.post('/', data=dict(
+            stock=TEST_STOCK2,
+            volume='29999313486231599000000000000000000000000000000000000'+
+            '0000000000000000000000000000000000000000000000000000000000000'+
+            '00000000000000000000000000000000000000000000000000000100000000'+
+            '000000000000000000000000000000000000000000000000000000000000000'+
+            '0000000000000000000000000000000000000000000000000000000000000000000010'
+    ), follow_redirects=True)
+    assert b"Number of Shares too large" in post_response.data
+    assert bytes(TEST_STOCK2, encoding=ENCODING) not in post_response.data
+
     # Add non-positive volume
     post_response = client.post('/', data=dict(
             stock=TEST_STOCK2,
@@ -44,6 +57,14 @@ def test_index(client):
     assert b"Number of Shares must be a positive integer" in post_response.data
     assert bytes(TEST_STOCK2, encoding=ENCODING) not in post_response.data
 
+    # Add ETF stock symbol
+    post_response = client.post('/', data=dict(
+            stock=TEST_ETF,
+            volume='3'
+    ), follow_redirects=True)
+    assert bytes("Cannot process ETF: {}".format(TEST_ETF), 
+        encoding=ENCODING) in post_response.data
+
     # Add TEST_STOCK2
     post_response = client.post('/', data=dict(
             stock=TEST_STOCK2,

tests/test_results.py

@@ -109,6 +109,7 @@ def fake_financials(_self, symbol, typ):
 def test_sectors(client, monkeypatch):
     def fake_profile2(_self, **params):
         return dict(finnhubIndustry='gamer')
+    # set one hobby with fake function
     monkeypatch.setattr('finnhub.Client.company_profile2', fake_profile2)
 
     client.post('/', data=dict(
@@ -127,7 +128,7 @@ def fake_profile2(_self, **params):
 def test_generate_uid(client, app, monkeypatch):
     def fake_secrets_choice(sequence):
         return 'A'
-
+    # Replace choice function with fake
     monkeypatch.setattr('secrets.choice', fake_secrets_choice)
 
     client.post('/', data=dict(