Compare commits

..

1 Commits

Author SHA1 Message Date
dependabot[bot]
d3266887f0 Bump pyjwt from 2.3.0 to 2.4.0 in /api
Bumps [pyjwt](https://github.com/jpadilla/pyjwt) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/jpadilla/pyjwt/releases)
- [Changelog](https://github.com/jpadilla/pyjwt/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/jpadilla/pyjwt/compare/2.3.0...2.4.0)

---
updated-dependencies:
- dependency-name: pyjwt
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-13 09:31:41 +00:00
6 changed files with 37 additions and 49 deletions

View File

@@ -10,6 +10,8 @@ updates:
directory: "/api"
schedule:
interval: "daily"
assignees:
- "H4CK3R-01"
open-pull-requests-limit: 100
# Bot
@@ -17,6 +19,10 @@ updates:
directory: "/telegram_bot"
schedule:
interval: "daily"
assignees:
- "NormalParameter"
- "Rripped"
- "FlorianKellermann"
open-pull-requests-limit: 100
# Frontend
@@ -24,4 +30,6 @@ updates:
directory: "/frontend"
schedule:
interval: "daily"
assignees:
- "kevinpauer"
open-pull-requests-limit: 100

View File

@@ -4,7 +4,7 @@ uwsgi==2.0.20
Flask_SQLAlchemy==2.5.1
python-dotenv==0.20.0
pymysql==1.0.2
pyjwt==2.3.0
pyjwt==2.4.0
apiflask==1.0.0
flask-cors==3.0.10
bcrypt==3.2.2

View File

@@ -30,7 +30,7 @@
"@angular-eslint/eslint-plugin": "13.2.1",
"@angular-eslint/eslint-plugin-template": "13.2.1",
"@angular-eslint/schematics": "13.2.1",
"@angular-eslint/template-parser": "14.0.4",
"@angular-eslint/template-parser": "13.2.1",
"@angular/cli": "~13.3.5",
"@angular/compiler-cli": "~13.2.0",
"@types/jasmine": "~4.0.3",
@@ -423,12 +423,12 @@
}
},
"node_modules/@angular-eslint/template-parser": {
"version": "14.0.4",
"resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-14.0.4.tgz",
"integrity": "sha512-L7+VHWlIUiUml81q43tP/CZZhIDkbHoin2OH+0TEqeQuCcYZwZQfUBey0pmbzzhjZD2tV75QxlAUqFCuM85Tng==",
"version": "13.2.1",
"resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-13.2.1.tgz",
"integrity": "sha512-aSZjKYTUXjJ3sehm90CfZey/ed333IxP0TpnaG7Lue9rSEa3BkKOv8Kffy+EhDkpdTpjdwdmGfopxxsbm9sPHw==",
"dev": true,
"dependencies": {
"@angular-eslint/bundled-angular-compiler": "14.0.4",
"@angular-eslint/bundled-angular-compiler": "13.2.1",
"eslint-scope": "^5.1.0"
},
"peerDependencies": {
@@ -436,12 +436,6 @@
"typescript": "*"
}
},
"node_modules/@angular-eslint/template-parser/node_modules/@angular-eslint/bundled-angular-compiler": {
"version": "14.0.4",
"resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-14.0.4.tgz",
"integrity": "sha512-/fbXDvkm4q95xG/9LZDtiyE2MQwT061sanmMginDk63f0dlC4H+AXgggva38YNRN+CFcbFtWfikTy7yFdNFZlA==",
"dev": true
},
"node_modules/@angular-eslint/utils": {
"version": "13.2.1",
"resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-13.2.1.tgz",
@@ -14273,21 +14267,13 @@
}
},
"@angular-eslint/template-parser": {
"version": "14.0.4",
"resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-14.0.4.tgz",
"integrity": "sha512-L7+VHWlIUiUml81q43tP/CZZhIDkbHoin2OH+0TEqeQuCcYZwZQfUBey0pmbzzhjZD2tV75QxlAUqFCuM85Tng==",
"version": "13.2.1",
"resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-13.2.1.tgz",
"integrity": "sha512-aSZjKYTUXjJ3sehm90CfZey/ed333IxP0TpnaG7Lue9rSEa3BkKOv8Kffy+EhDkpdTpjdwdmGfopxxsbm9sPHw==",
"dev": true,
"requires": {
"@angular-eslint/bundled-angular-compiler": "14.0.4",
"@angular-eslint/bundled-angular-compiler": "13.2.1",
"eslint-scope": "^5.1.0"
},
"dependencies": {
"@angular-eslint/bundled-angular-compiler": {
"version": "14.0.4",
"resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-14.0.4.tgz",
"integrity": "sha512-/fbXDvkm4q95xG/9LZDtiyE2MQwT061sanmMginDk63f0dlC4H+AXgggva38YNRN+CFcbFtWfikTy7yFdNFZlA==",
"dev": true
}
}
},
"@angular-eslint/utils": {

View File

@@ -34,7 +34,7 @@
"@angular-eslint/eslint-plugin": "13.2.1",
"@angular-eslint/eslint-plugin-template": "13.2.1",
"@angular-eslint/schematics": "13.2.1",
"@angular-eslint/template-parser": "14.0.4",
"@angular-eslint/template-parser": "13.2.1",
"@angular/cli": "~13.3.5",
"@angular/compiler-cli": "~13.2.0",
"@types/jasmine": "~4.0.3",

View File

@@ -208,7 +208,7 @@ def send_status(message):
bot.reply_to(message, "bot is running")
@bot.message_handler(commands=['portfolio', 'Portfolio']) # /portfolio -> print all owned shares
@bot.message_handler(commands=['portfolio', 'Portfolio']) # /update -> update shares
def update_for_user(message):
p_user_id = int(message.from_user.id)
p_my_handler = api_handler

View File

@@ -63,13 +63,8 @@ def update_crontab(p_my_handler):
global user_crontab
global user_ids
all_users = p_my_handler.get_all_users() # get all users so crontabs can update for everybody
if all_users == None:
print("No users found, trying again.")
update_crontab(p_my_handler)
return
all_users = p_my_handler.get_all_users() # get all users so crontabs can update for everybody
user_ids = []
user_crontab = []
@@ -80,9 +75,10 @@ def update_crontab(p_my_handler):
user_ids.append(int(element["telegram_user_id"]))
try:
user_crontab.append(str(element["cron"]))
except:
user_ids.pop() # if something goes wrong with cron I have to delete matching user id
except: continue
except:
user_ids.pop() # if something goes wrong with cron I have to delete matching user id
except:
continue
print(user_ids)
@@ -134,23 +130,21 @@ def update_for_user(p_user_id, p_my_handler):
"""
share_symbols = []
share_amounts = []
my_portfolio = p_my_handler.get_user_portfolio(p_user_id) # get all existing shares for user
if my_portfolio!=None:
for element in my_portfolio:
if element["count"] != '' and element["isin"] != '':
print(element["count"], element["isin"])
share_symbols.append(element["isin"])
share_amounts.append(element["count"])
my_portfolio = p_my_handler.get_user_portfolio(p_user_id) # get all existing shares for user
for element in my_portfolio:
if element["count"] != '' and element["isin"] != '':
print(element["count"], element["isin"])
share_symbols.append(element["isin"])
share_amounts.append(element["count"])
my_user = p_my_handler.get_user(p_user_id)
send_to_user("Hello %s this is your 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) # all interest shares
if len(share_symbols) != 0: # iterate through all shares
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: {hf.make_markdown_proof(share_amounts[i])}\nTotal: {hf.make_markdown_proof(round(float(my_price) * float(share_amounts[i]), 2))} EUR'