Refactoring quandl.py

hackathon_starter/hackathon/scripts/quandl.py

@@ -4,6 +4,21 @@ aggregating data from markets throughout the world'''
 import requests
 import json
 
+def fetchData(apikey, url):
+    '''Returns JSON data of the Dow Jones Average.'''
+    parameters = {'rows' : 1, 'auth_token' : apikey}
+    req = requests.get(url, params=parameters)
+    data = json.loads(req.content)
+    parsedData = []
+    stockData = {}
+    for datum in data:
+        stockData['name'] = data['name']
+        stockData['description'] = data['description']
+        stockData['data'] = data['data']
+        stockData['code'] = data['code']
+    parsedData.append(stockData)
+    return parsedData   
+
 def dowjonesIndustrialAvg(apikey):
     '''Returns JSON data of the Dow Jones Average.'''
     parameters = {'rows' : 1, 'auth_token' : apikey}

hackathon_starter/hackathon/views.py

@@ -104,11 +104,14 @@ def quandlNasdaq(request):
 def quandlstocks(request):
     APIKEY = 'fANs6ykrCdAxas7zpMz7'	
     everyData = {}
-    dowjonesdata = dowjonesIndustrialAvg(APIKEY)
+    dowjonesdata = fetchData(APIKEY, 'https://www.quandl.com/api/v1/datasets/BCB/UDJIAD1.json?')
+    #dowjonesdata = dowjonesIndustrialAvg(APIKEY)
     everyData['dow'] = dowjonesdata
-    snpdata = snp500IndexPull(APIKEY)
+    snpdata = fetchData(APIKEY, 'https://www.quandl.com/api/v1/datasets/YAHOO/INDEX_GSPC.json?')
+    #snpdata = snp500IndexPull(APIKEY)
     everyData['snp'] = snpdata
-    nasdaqdata = nasdaqPull(APIKEY)
+    nasdaqdata = fetchData(APIKEY, 'https://www.quandl.com/api/v1/datasets/NASDAQOMX/COMP.json?')
+    #nasdaqdata = nasdaqPull(APIKEY)
     everyData['nasdaq'] = nasdaqdata
     return render(request, 'hackathon/quandl.html', { 'everyData': everyData })