Add transactions to web API and refactor

apis/db/psql.py

@@ -163,8 +163,7 @@ def get_amount(username, password):
     headers = {'Content-Type': 'application/json'}
     data = json.dumps({'username': username, 'password': password})
     req = requests.get(url, headers=headers, data=data)
-    response = json.loads(req.text)
-    return response['amount']
+    return float(req.text)
 
 
 def execute_and_commit(query):

apis/web/app.py

@@ -1,12 +1,12 @@
 import json
 from flask import Flask, request
 from operator import itemgetter
-from web import login_valid, get_amount
+from web import login_valid, get_amount, get_transactions
 
 app = Flask(__name__)
 
 
-@app.route('/validate')
+@app.route('/validate', methods=['POST'])
 def validate():
     body = request.get_json()
     username, password = itemgetter('username', 'password')(body)
@@ -15,7 +15,7 @@ def validate():
     })
 
 
-@app.route('/credit', methods=['GET'])
+@app.route('/credit', methods=['POST'])
 def credit():
     body = request.get_json()
     username, password = itemgetter('username', 'password')(body)
@@ -25,9 +25,20 @@ def credit():
     except AssertionError:
         return f'Error on account: {username}', 404
 
-    return json.dumps({
-        'amount': amount
-    })
+    return str(amount)
+
+
+@app.route('/transaction', methods=['POST'])
+def transaction():
+    body = request.get_json()
+    username, password = itemgetter('username', 'password')(body)
+
+    try:
+        transactions = get_transactions(username, password)
+    except AssertionError:
+        return f'Error on account: {username}', 404
+
+    return json.dumps(transactions)
 
 
 if __name__ == '__main__':

apis/web/web/__init__.py

@@ -1,3 +1,4 @@
 from .utils import get_request_params
 from .login import login_valid
-from .balance import get_amount
+from .balance import get_amount
+from .transaction import get_transactions

hosts/telebot/handlers/conv/add_subscription.py

@@ -92,7 +92,7 @@ def validate_credentials(username, password):
     url = f'http://{WEB_API_HOST}:{WEB_API_PORT}/validate'
     headers = {'Content-Type': 'application/json'}
     data = json.dumps({'username': username, 'password': password})
-    req = requests.get(url, headers=headers, data=data)
+    req = requests.post(url, headers=headers, data=data)
     response = json.loads(req.text)
     return response['valid']
 

services/scraper.py

@@ -31,12 +31,12 @@ def get_amount(account):
     url = f'http://{WEB_API_HOST}:{WEB_API_PORT}/credit'
     headers = {'Content-Type': 'application/json'}
     data = json.dumps({'username': account.username, 'password': account.password})
-    req = requests.get(url, headers=headers, data=data)
+    req = requests.post(url, headers=headers, data=data)
 
     if not req.ok:
-        raise RetrieveError(username)
+        raise RetrieveError(account.username)
 
-    amount = json.loads(req.text)['amount']
+    amount = float(req.text)
     return amount