Removed DataService class

flaskapp/tests/test_run.py

@@ -6,8 +6,6 @@
 from flaskapp.tests.utility import client, create_user, login
 from flaskapp.tests.id_parser import get_element_by_id
 
-from flaskapp.services import DataService
-
 DATASERVICE = os.environ['DATA_SERVICE']
 
 

flaskapp/views/auth.py

@@ -5,8 +5,8 @@
 from flaskapp.views.home import index, home
 from stravalib import Client
 from flaskapp.auth import strava_auth_url
-from flaskapp.services import DataService
 
+import requests
 import os
 
 auth = Blueprint('auth', __name__)
@@ -28,12 +28,10 @@ def _strava_auth():  # pragma: no cover
     if user_id is None:
         return make_response(render_template('strava_error.html', auth_url=strava_auth_url()), 409)
 
-    # print('uise: ', access_token)
-
     if 'access_token' in access_token:  # compatibility with stravalib 0.10
         access_token = access_token['access_token']
 
-    reply = DataService().post('/users/%s'%str(user_id), data={'strava_token': access_token})
+    reply = requests.post(DATASERVICE + '/users/%s'%str(user_id), json={'strava_token': access_token})
 
     if reply.status_code == 409:
         return make_response(render_template('strava_error.html', auth_url=strava_auth_url()), 409)

flaskapp/views/home.py

@@ -1,14 +1,15 @@
 from flask import Blueprint, render_template
 from flask_login import current_user
-from flaskapp.services import DataService
 from flaskapp.auth import strava_auth_url
 from stravalib import Client
 
 import requests
 import functools
+import os
 
 home = Blueprint('home', __name__)
 
+DATASERVICE = os.environ['DATA_SERVICE']
 
 @home.route('/')
 def index():
@@ -18,19 +19,18 @@ def index():
     if hasattr(current_user, 'is_authenticated') and current_user.is_authenticated:
         try:
             print("Try to get user data", current_user)
-            reply = DataService().get("/users/%s" % current_user.dataservice_user_id, params={})
+            reply = requests.get(DATASERVICE + "/users/%s" % current_user.dataservice_user_id)
 
             user = reply.json()
 
-            reply = DataService().get("/runs", params={'user_id': current_user.dataservice_user_id})
+            reply = requests.get(DATASERVICE + "/runs", params={'user_id': current_user.dataservice_user_id})
             if reply is not None:
                 runs = reply.json()
                 if len(runs) > 0:
                     total_average_speed = functools.reduce(lambda x, y: x + y, [run['average_speed'] for run in runs], 0) / len(runs)
 
         except Exception as ex:
             print("ERROR: ", ex)
-            # TODO: Add an error message
 
     return render_template("index.html", credential=current_user, user=user, strava_auth_url=strava_auth_url(),
                            total_average_speed=total_average_speed, runs=runs)

flaskapp/views/run.py

@@ -1,17 +1,19 @@
 from flask import Blueprint, render_template, abort, request, jsonify
 from flask_login import login_required
 import requests
-from flaskapp.services import DataService
+import os
 
 from flaskapp.database import db
 
 run = Blueprint('run', __name__)
 
+DATASERVICE = os.environ['DATA_SERVICE']
+
 
 @run.route('/run/<id>', methods=['GET'])
 @login_required
 def get_run(id):
-    run = DataService().get("/runs", params={'run_id': id})
+    run = requests.get(DATASERVICE + "/runs", params={'run_id': id})
 
     if run is None:
         abort(404)

flaskapp/views/statistics.py

@@ -4,10 +4,13 @@
 from flaskapp.database import db
 from flaskapp.auth import current_user
 
-from flaskapp.services import DataService
+import requests
+import os
+
 
 statistics = Blueprint('statistics', __name__)
 
+DATASERVICE = os.environ['DATA_SERVICE']
 
 @statistics.route('/statistics', methods=['GET'])
 @login_required
@@ -18,7 +21,7 @@ def get_statistics():
     runs = []
     stats = dict()
     try:
-        reply = DataService().get("/runs", params={'user_id': current_user.dataservice_user_id})
+        reply = requests.get(DATASERVICE + "/runs", params={'user_id': current_user.dataservice_user_id})
 
         if reply.status_code is not 200:
             raise "error"

flaskapp/views/users.py

@@ -3,7 +3,6 @@
 from flaskapp.database import db, Credential, User
 from flaskapp.auth import admin_required
 from flaskapp.forms import UserForm, DeleteForm
-from flaskapp.services import DataService
 
 import requests
 import os
@@ -34,7 +33,7 @@ def create_user():
             new_user = User()
             form.populate_obj(new_user)
 
-            reply = DataService().post('/users', data=new_user.to_json())
+            reply = requests.post(DATASERVICE + '/users', json=new_user.to_json())
 
             credential = db.session.query(Credential).filter(new_user.email == Credential.email).first()
             if credential is None and reply.status_code == 200:
@@ -69,7 +68,7 @@ def delete_user():
         if form.validate_on_submit():
             if current_user.authenticate(form.password.data) and hasattr(current_user, 'dataservice_user_id'):
 
-                reply = DataService.delete(url="/users/%s" % current_user.dataservice_user_id, params={})
+                reply = requests.delete(DATASERVICE + "/users/%s" % current_user.dataservice_user_id)
 
                 if reply.status_code == 200:
                     db.session.delete(current_user)