diff --git a/Dockerfile b/Dockerfile index 6d4f8f3caf31b6f74906f9014103aa57437ab8b2..81d1c4075b33077eebe11cf3fe17f71a1f889063 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,10 +24,13 @@ RUN apt-get -qq update && apt-get install -y \ python3 \ python3-pip \ supervisor \ + libpq-dev \ && rm -rf /var/lib/apt/lists/* RUN pip3 install -q uwsgi +RUN pip3 install --no-binary :all: psycopg2==2.7.3.2 + COPY ./requirements.txt $CODEROOT/requirements.txt RUN sed -i "s@git+ssh:\/\/git@git+https:\/\/$GITHUB_OAUTH_TOKEN@" $CODEROOT/requirements.txt diff --git a/app/controllers/bgroup.py b/app/controllers/bgroup.py index 1ef19ee2a040aaa7d057f60ab24c92153ab9cfd4..249d41a0cca1a56ed85487e626c566dbfaf1555b 100644 --- a/app/controllers/bgroup.py +++ b/app/controllers/bgroup.py @@ -1,5 +1,5 @@ """Building groups controller""" -from flask import g, current_app +from flask import g from werkzeug.exceptions import BadRequest from .base import RestController from ..forms.bgroup import BGroupForm, BuildingBGroupForm @@ -18,14 +18,11 @@ class BGroupController(RestController): def index(self, filter_data): """Get a query for all models matching filter_data.""" - current_app.logger.info('Checking global permissions') if 'read_all::BGroup' in g.user_permissions: - current_app.logger.info(filter_data) return super().index(filter_data) - current_app.logger.info('Fetch and check if user has access if not global') user_groups = g.get('user_groups', None) user_group_ids = [group_id for group_id in user_groups] - + # Query to select groups for external users query = ''' SELECT bgroup.id, name, priority, time_created, time_modified, user_created, user_modified from groups.bgroup JOIN groups.bgroup_user_group on groups.bgroup.id = groups.bgroup_user_group.bgroup_id @@ -34,7 +31,6 @@ class BGroupController(RestController): if 'limit' in filter_data: query += 'LIMIT {}'.format(int(filter_data['limit'])) - current_app.logger.info('execute query') results = self.db.session.execute(query) return [dict(row) for row in results] diff --git a/app/lib/database.py b/app/lib/database.py index c1c84241a7f826a6771491421b156b3544c86d84..f8f75b395b37ffcbc052774f11e150b426bf27fb 100644 --- a/app/lib/database.py +++ b/app/lib/database.py @@ -2,7 +2,6 @@ import sqlite3 from sqlalchemy import event from flask.ext.sqlalchemy import SQLAlchemy - # A convenience instance for database objects. All access to database models # and operations should be through this object. db = SQLAlchemy() @@ -67,7 +66,6 @@ def proc(model, method, limit=None, offset=None, **kwargs): Returns: list: Results of the query """ - params = "" cols = ','.join(str(i) for i in model.__table__.get_columns()) # By seperating the args like this sanatation will happen automatically @@ -95,7 +93,6 @@ def proc(model, method, limit=None, offset=None, **kwargs): try: results = db.session.execute(query, input_args) db.session.commit() - data = [] for row in results: data.append(model(**dict(zip(row.keys(), row)))) diff --git a/app/permissions/application.py b/app/permissions/application.py index 42cc990960d12074b23866d4cb14763a389c9ee1..07ccbc9cd601811dee4f53c5f89e8480cd220d82 100644 --- a/app/permissions/application.py +++ b/app/permissions/application.py @@ -18,7 +18,6 @@ class AppNeed(Permission): # Check for a key. key = session.get('app_key') if not key: - current_app.logger.info('Session app key is empty') return False token = session.get('app_token') diff --git a/app/permissions/authorization.py b/app/permissions/authorization.py index 5268e4781f28e04bf3a7b7c3d3762350c4117af6..61d61482b6d76a4ad557e458cefbbd95b11d4b2c 100644 --- a/app/permissions/authorization.py +++ b/app/permissions/authorization.py @@ -29,7 +29,6 @@ def secured(f): params = {'expand': ''} response = services.user.get('/user/{}'.format(g.sub), headers=headers, params=params) - current_app.logger.info('Response status code {}'.format(response.status_code)) if not response.status_code == 200: raise Unauthorized @@ -45,6 +44,5 @@ def secured(f): else: raise Unauthorized - current_app.logger.info('Authorized request') return f(*args, **kwargs) return decorated_function diff --git a/app/views/bgroup.py b/app/views/bgroup.py index 07e784af78bca70f645b045187fc19427f7cd9d0..7dea56a71cc536006e6c85095274b680c414daed 100644 --- a/app/views/bgroup.py +++ b/app/views/bgroup.py @@ -1,5 +1,5 @@ """Building group view""" -from flask import request, current_app +from flask import request from flask.ext.classy import route from werkzeug.exceptions import MethodNotAllowed from ..views.base import RestView @@ -30,10 +30,7 @@ class BuildingBGroupView(RestView): @route('/', methods=['GET']) def get(self, bgroup_id): """Get buildings within a bgroup""" - current_app.logger.info("in the view") buildings = self.get_controller().get(bgroup_id, request.args) - current_app.logger.info("controller worked") - current_app.logger.info(buildings) return self.json(buildings) @route('//', methods=['DELETE']) diff --git a/app/views/building.py b/app/views/building.py index 7fcf5b378a873114ab0ddecd9e7628d85c0cfcc6..dbd499c52d51689694c2797af85f72320bc27ed4 100644 --- a/app/views/building.py +++ b/app/views/building.py @@ -26,7 +26,6 @@ class BuildingView(UnprotectedRestView): """/ GET - Retrieve a list of resources.""" # TODO: Add data key back to self.json # return super(BuildingView, self).index(request.args) - print("entering index") return self.json( [self.parse(m) for m in self.get_controller().index(request.args)] )