Merge branch 'master' into '88-switch-to-marketdata-app-for-stock-market-data'

# Conflicts:
#   .gitlab-ci.yml

.gitlab-ci.yml

@@ -16,7 +16,7 @@ build:master:
       --dockerfile "${CI_PROJECT_DIR}/Dockerfile"
       --destination "${CI_REGISTRY_IMAGE}:latest"
   rules:
-    - if: '$CI_COMMIT_BRANCH == "master"'
+    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
 
 
 build:branch:
@@ -31,4 +31,4 @@ build:branch:
       --destination "${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}"
       --destination "${CI_REGISTRY_IMAGE}:${CI_COMMIT_BRANCH}"
   rules:
-    - if: '$CI_COMMIT_BRANCH != "master"'
+    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "master"'

MarketData.py

@@ -101,19 +101,8 @@ class MarketData:
         """
 
         if quoteResp := self.get(f"stocks/quotes/{symbol}/"):
-            price = round(quoteResp["last"][0], 2)
+            return f"The current price of {quoteResp['symbol']} is ${quoteResp['last']}"
-            changePercent = round(quoteResp["changepct"][0], 2)
 
-            message = f"The current price of {symbol.name} is ${price} and "
-
-            if changePercent > 0.0:
-                message += f"is currently up {changePercent}% for the day."
-            elif changePercent < 0.0:
-                message += f"is currently down {changePercent}% for the day."
-            else:
-                message += "hasn't shown any movement for the day."
-
-            return message
         else:
             return f"Getting a quote for {symbol} encountered an error."
 

Symbol.py

@@ -32,8 +32,8 @@ class Stock(Symbol):
     def __init__(self, symbol: str) -> None:
         self.symbol = symbol
         self.id = symbol
-        self.name = "$" + symbol.upper()
+        self.name = "$" + symbol
-        self.tag = "$" + symbol.lower()
+        self.tag = "$" + symbol.upper()
 
 
 class Coin(Symbol):