diff --git a/telegram_bot/bot_updates.py b/telegram_bot/bot_updates.py index 529aa31..0a993dc 100644 --- a/telegram_bot/bot_updates.py +++ b/telegram_bot/bot_updates.py @@ -63,30 +63,51 @@ def update_crontab(p_my_handler): global user_crontab global user_ids +<<<<<<< HEAD + + all_users = p_my_handler.get_all_users() # get all users so crontabs can update for everybody + +======= all_users = p_my_handler.get_all_users() +>>>>>>> origin/main user_ids = [] user_crontab = [] for element in all_users: - if element["cron"] != '' and element["telegram_user_id"] != '': + if element["cron"] != '' and element["telegram_user_id"] != '': # check if both values are existing so I have consistent data try: user_ids.append(int(element["telegram_user_id"])) try: user_crontab.append(str(element["cron"])) +<<<<<<< HEAD + except: + user_ids.pop() # if something goes wrong with cron I have to delete matching user id + except: continue + + +======= except: user_ids.pop() except: continue +>>>>>>> origin/main print(user_ids) update_based_on_crontab(user_ids, user_crontab, p_my_handler) +<<<<<<< HEAD + + update_crontab(p_my_handler) # restart the update after time sleep + + +======= update_crontab(p_my_handler) +>>>>>>> origin/main def update_based_on_crontab(p_user_ids, p_user_crontab, p_my_handler): """ Check all the crontab codes and add jobs to start in time :type p_user_ids: array @@ -102,20 +123,33 @@ def update_based_on_crontab(p_user_ids, p_user_crontab, p_my_handler): :rtype: none """ +<<<<<<< HEAD + + my_scheduler = BackgroundScheduler() # schedule sends based on cron + +======= my_scheduler = BackgroundScheduler() +>>>>>>> origin/main for i in range(len(p_user_ids)): - cron_split = p_user_crontab[i].split(" ") + cron_split = p_user_crontab[i].split(" ") # split it up to use in scheduler print(cron_split[4], cron_split[1], cron_split[0], cron_split[3], cron_split[2]) my_scheduler.add_job(update_for_user, 'cron', day_of_week=cron_split[4], hour=cron_split[1], minute=cron_split[0], month=cron_split[3], day=cron_split[2], args=(p_user_ids[i], p_my_handler)) my_scheduler.start() +<<<<<<< HEAD + + time.sleep( 600 ) # scheduler runs in background and I wait 10mins + my_scheduler.shutdown() # after this the new crontabs will be loaded + +======= time.sleep(600) my_scheduler.shutdown() +>>>>>>> origin/main def update_for_user(p_user_id, p_my_handler): """ Pull shares and send updates for specific user id :type p_user_id: integer @@ -130,10 +164,16 @@ def update_for_user(p_user_id, p_my_handler): """ share_symbols = [] share_amounts = [] +<<<<<<< HEAD + + my_portfolio = p_my_handler.get_user_portfolio(p_user_id) # get all existing shares for user + +======= share_courses = [] my_portfolio = p_my_handler.get_user_portfolio(p_user_id) +>>>>>>> origin/main for element in my_portfolio: if element["count"] != '' and element["isin"] != '': print(element["count"], element["isin"]) @@ -141,14 +181,22 @@ def update_for_user(p_user_id, p_my_handler): share_amounts.append(element["count"]) my_user = p_my_handler.get_user(p_user_id) +<<<<<<< HEAD + send_to_user("Hello %s this is your share update for today:"%str(my_user["username"]), pUser_id=p_user_id) + + shares = p_my_handler.get_user_shares(p_user_id) # all interest shares + + if len(share_symbols) != 0: # iterate through all shares +======= send_to_user("Hello %s this is your share update for today:" % str(my_user["username"]), pUser_id=p_user_id) shares = p_my_handler.get_user_shares(p_user_id) if len(share_symbols) != 0: +>>>>>>> origin/main for i in range(len(share_symbols)): my_price = share_fetcher.get_share_price_no_currency(share_symbols[i]) - my_update_message = f'{share_fetcher.get_share_information_markdown(share_symbols[i])}\ncount: {share_amounts[i]}\nTotal: {hf.make_markdown_proof(round(float(my_price) * float(share_amounts[i]), 2))} EUR' + my_update_message = f'{share_fetcher.get_share_information_markdown(share_symbols[i])}\ncount: {hf.make_markdown_proof(share_amounts[i])}\nTotal: {hf.make_markdown_proof(round(float(my_price) * float(share_amounts[i]), 2))} EUR' bot.send_message(chat_id=p_user_id, text=my_update_message, parse_mode="MARKDOWNV2") else: send_to_user("No shares found for your account. Check https://gruppe1.testsites.info to change your settings and add shares.", pUser_id=p_user_id) @@ -166,11 +214,19 @@ def update_for_user(p_user_id, p_my_handler): news = news_fetcher.get_top_news_by_keyword(keyword)["articles"] keyword = hf.make_markdown_proof(keyword) +<<<<<<< HEAD + if not news: # if empty news array + send_to_user(f"No news found for keyword _{keyword}_\.", pUser_id=p_user_id, md_mode=True) + + elif news == None: # if news is none + send_to_user(f"Server error for keyword _{keyword}_\.", pUser_id=p_user_id, md_mode=True) +======= if not news: # if empty news array send_to_user(f"No news found for keyword _{keyword}_.", pUser_id=p_user_id, md_mode=True) elif news == None: # if news is none send_to_user(f"Server error for keyword _{keyword}_.", pUser_id=p_user_id, md_mode=True) +>>>>>>> origin/main else: news_formatted = news_fetcher.format_article(news[0]) # format for message, only use the most popular article send_to_user(f"_keyword: {keyword}_\n\n{news_formatted}", pUser_id=p_user_id, md_mode=True) # send news with related keyword in Markdown diff --git a/telegram_bot/shares/share_fetcher.py b/telegram_bot/shares/share_fetcher.py index a1295ea..66cf0a4 100644 --- a/telegram_bot/shares/share_fetcher.py +++ b/telegram_bot/shares/share_fetcher.py @@ -23,22 +23,23 @@ def get_share_price(str_search_for): try: search_result = investpy.search_quotes(text=str_search_for, products=['stocks'], n_results=1, countries=['germany']) - currency = str(search_result.retrieve_currency()) - - recent_data = pandas.DataFrame(search_result.retrieve_recent_data()) - - stock_price = recent_data.iloc[-1]["Close"] - + currency = str(search_result.retrieve_currency()) # retrieve currency from data + # should always be Euro because of countries=['germany'] + + recent_data = pandas.DataFrame(search_result.retrieve_recent_data()) # stock prices of last few days + + stock_price = recent_data.iloc[-1]["Close"] # retrieve latest stock price + stock_price = round(float(stock_price), 2) - - str_return = str(stock_price) + " " + str(currency) - + + str_return =str(stock_price) + " " + str(currency) # return + currency + return str_return - - except RuntimeError: + + except RuntimeError: # if no shares are found for germany (e.g. isin: US.....) try: - my_Converter = CurrencyConverter() - + my_Converter = CurrencyConverter() # need a currency converter + search_result = investpy.search_quotes(text=str_search_for, products=['stocks'], n_results=1) currency = str(search_result.retrieve_currency()) @@ -46,9 +47,10 @@ def get_share_price(str_search_for): recent_data = pandas.DataFrame(search_result.retrieve_recent_data()) stock_price = recent_data.iloc[-1]["Close"] - - stock_price = my_Converter.convert(float(stock_price), str(currency), 'EUR') - + + #convert stock price from currency to EUR + stock_price = my_Converter.convert(float(stock_price), str(currency), 'EUR') + stock_price = round(float(stock_price), 2) str_return = str(stock_price) + " EUR" @@ -107,9 +109,17 @@ def get_share_information(str_search_for): def get_share_information_markdown(str_search_for): - search_result = investpy.search_quotes(text=str_search_for, products=['stocks'], - countries=['germany'], n_results=1) + try: + search_result = investpy.search_quotes(text=str_search_for, products=['stocks'], + countries=['germany'], n_results=1) + + except RuntimeError as e: + return hf.make_markdown_proof(f"no shares found for \"{str_search_for}\"") # if no shares are found, make error message markdown proof and return + + except ConnectionError as e: + return hf.make_markdown_proof(f"connection not possible. Try again later.") # if no connection, make error message markdown proof and return + str_return = f'*{hf.make_markdown_proof(search_result.name)}*\n_{hf.make_markdown_proof(search_result.symbol)}_\nworth: {hf.make_markdown_proof(get_share_price(str_search_for))}' return str_return