fix isin retrieval

NelsonDane · Jun 5, 2024 · 7d9f1d9 · 7d9f1d9
1 parent 7e085eb
commit 7d9f1d9
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 22 deletions.
diff --git a/fennel_invest_api/endpoints.py b/fennel_invest_api/endpoints.py
@@ -139,7 +139,8 @@ def stock_search_query(self, symbol, count=5):
                     searchSecurities(query: $query, count: $count) {
                         isin
                         security {
-                                currentStockPrice
+                            currentStockPrice
+                            ticker
                         }
                     }
                 }

diff --git a/fennel_invest_api/fennel.py b/fennel_invest_api/fennel.py
@@ -214,14 +214,16 @@ def get_stock_quote(self, ticker):
                 f"Stock Search Request failed with status code {search_response.status_code}: {search_response.text}"
             )
         search_response = search_response.json()
-        return search_response
+        securities = search_response["data"]["searchSearch"]["searchSecurities"]
+        if len(securities) == 0:
+            raise Exception(f"No stock found with ticker {ticker}. Please check the app to see if it is valid.")
+        stock_quote = next((x for x in securities if x["security"]["ticker"].lower() == ticker.lower()), None)
+        return stock_quote
 
     @check_login
     def get_stock_price(self, ticker):
         quote = self.get_stock_quote(ticker)
-        if len(quote["data"]["searchSearch"]["searchSecurities"]) == 0:
-            return None
-        return quote["data"]["searchSearch"]["searchSecurities"][0]["security"]["currentStockPrice"]
+        return None if quote is None else quote["security"]["currentStockPrice"]
 
     @check_login
     def get_stock_holdings(self, account_id):
@@ -251,6 +253,11 @@ def is_market_open(self):
         response = response.json()
         return response["data"]["securityMarketInfo"]["isOpen"]
 
+    @check_login
+    def get_stock_isin(self, ticker):
+        quote = self.get_stock_quote(ticker)
+        return None if quote is None else quote["isin"]
+
     @check_login
     def place_order(
         self, account_id, ticker, quantity, side, price="market", dry_run=False
@@ -261,27 +268,24 @@ def place_order(
         if not self.is_market_open():
             raise Exception("Market is closed. Cannot place order.")
         # Search for stock "isin"
-        query = self.endpoints.stock_search_query(ticker)
-        headers = self.endpoints.build_headers(self.Bearer)
-        search_response = self.session.post(
-            self.endpoints.graphql, headers=headers, data=query
-        )
-        if search_response.status_code != 200:
-            raise Exception(
-                f"Stock Search Request failed with status code {search_response.status_code}: {search_response.text}"
-            )
-        search_response = search_response.json()
+        isin = self.get_stock_isin(ticker)
+        if isin is None:
+            raise Exception(f"Failed to find ISIN for stock with ticker {ticker}")
         if dry_run:
-            return search_response
-        if len(search_response["data"]["searchSearch"]["searchSecurities"]) == 0:
-            raise Exception(
-                f"No stock found with ticker {ticker}. Please check the app to see if it is valid."
-            )
-        isin = search_response["data"]["searchSearch"]["searchSecurities"][0]["isin"]
+            return {
+                "account_id": account_id,
+                "ticker": ticker,
+                "quantity": quantity,
+                "isin": isin,
+                "side": side,
+                "price": price,
+                "dry_run_success": True,
+            }
         # Place order
         query = self.endpoints.stock_order_query(
             account_id, ticker, quantity, isin, side, price
         )
+        headers = self.endpoints.build_headers(self.Bearer)
         order_response = self.session.post(
             self.endpoints.graphql, headers=headers, data=query
         )

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name="fennel_invest_api",
-    version="1.0.8",
+    version="1.0.9",
     description="Unofficial Fennel.com Invest API written in Python Requests",
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",