From a5f031b009a694b20185dd9bbb49a705d66da483 Mon Sep 17 00:00:00 2001 From: H4CK3R-01 Date: Tue, 15 Mar 2022 09:45:01 +0100 Subject: [PATCH 1/5] Fixed portfolio api --- webservice/api_blueprint_portfolio.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webservice/api_blueprint_portfolio.py b/webservice/api_blueprint_portfolio.py index f8a715a..6ee8a37 100644 --- a/webservice/api_blueprint_portfolio.py +++ b/webservice/api_blueprint_portfolio.py @@ -24,7 +24,7 @@ def get_portfolio(): for row in transactions: if row.symbol in return_portfolio: return_portfolio[row.symbol]['count'] += row.count - return_portfolio[row.symbol]['last_transaction'] += row.time + return_portfolio[row.symbol]['last_transaction'] = row.time else: return_portfolio[row.symbol] = {"count": row.count, "last_transaction": row.time} From 169dd41bcd039dfbd221de16c6502239c97a03a4 Mon Sep 17 00:00:00 2001 From: H4CK3R-01 Date: Tue, 15 Mar 2022 09:51:06 +0100 Subject: [PATCH 2/5] Fixed bot dockerfile --- telegram_bot/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/telegram_bot/Dockerfile b/telegram_bot/Dockerfile index 2cef589..86a0cc7 100644 --- a/telegram_bot/Dockerfile +++ b/telegram_bot/Dockerfile @@ -1,6 +1,7 @@ FROM python:3.10-alpine WORKDIR /srv/flask_app +RUN apk add build-base jpeg-dev zlib-dev COPY telegram_bot/requirements.txt /srv/flask_app/ From b88f5fcf6575d5513fe9ee3911623f5f91471a98 Mon Sep 17 00:00:00 2001 From: Florian Kaiser <44125287+H4CK3R-01@users.noreply.github.com> Date: Tue, 15 Mar 2022 09:59:15 +0100 Subject: [PATCH 3/5] Update .env.example --- .env.example | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.env.example b/.env.example index 0dfeac3..176746a 100644 --- a/.env.example +++ b/.env.example @@ -1,9 +1,13 @@ -MYSQL_HOST= -MYSQL_PORT= -MYSQL_DATABASE= -MYSQL_USER= -MYSQL_PASSWORD= +# MYSQL Database +MYSQL_HOST= +MYSQL_PORT= +MYSQL_DATABASE= +MYSQL_USER= +MYSQL_PASSWORD= -BOT_API_KEY= +# Telegram bot api key +BOT_API_KEY= -SECRET_KEY= + +# Flask secret key +SECRET_KEY= From 564517045f8d42c834c39d7c89ff09fbc04f7be6 Mon Sep 17 00:00:00 2001 From: H4CK3R-01 Date: Tue, 15 Mar 2022 10:50:00 +0100 Subject: [PATCH 4/5] Fixed bot dockerfile --- telegram_bot/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telegram_bot/Dockerfile b/telegram_bot/Dockerfile index 86a0cc7..df6b0ce 100644 --- a/telegram_bot/Dockerfile +++ b/telegram_bot/Dockerfile @@ -1,7 +1,7 @@ FROM python:3.10-alpine WORKDIR /srv/flask_app -RUN apk add build-base jpeg-dev zlib-dev +RUN apk add build-base jpeg-dev zlib-dev musl-dev linux-headers g++ COPY telegram_bot/requirements.txt /srv/flask_app/ From aa95541d04c7870e185a33ae31d1093f537727bd Mon Sep 17 00:00:00 2001 From: Linus E <75929322+Rripped@users.noreply.github.com> Date: Tue, 15 Mar 2022 12:45:56 +0100 Subject: [PATCH 5/5] added .env to gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bc8a670..f5f8f89 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.idea/* \ No newline at end of file +.idea/* +.env \ No newline at end of file