Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,16 @@ def create_app(config_name):
db.init_app(application)
ma.init_app(application)
init_app(application)

logging.init_app(application)

from .service import service as service_blueprint
from .user import user as user_blueprint
from .template import template as template_blueprint
from app.service.rest import service as service_blueprint
from app.user.rest import user as user_blueprint
from app.template.rest import template as template_blueprint
from app.status.healthcheck import status as status_blueprint
application.register_blueprint(service_blueprint, url_prefix='/service')
application.register_blueprint(user_blueprint, url_prefix='/user')
application.register_blueprint(template_blueprint, url_prefix="/template")

from .status import status as status_blueprint
application.register_blueprint(status_blueprint)
application.register_blueprint(status_blueprint, url_prefix='/status')

return application

Expand Down
5 changes: 0 additions & 5 deletions app/service/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +0,0 @@
from flask import Blueprint

service = Blueprint('service', __name__)

from app.service.views import rest
5 changes: 3 additions & 2 deletions app/service/views/rest.py → app/service/rest.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
from app.models import Token
from app.schemas import (
services_schema, service_schema, template_schema)
from .. import service

from flask import Blueprint
service = Blueprint('service', __name__)


# TODO auth to be added.
@service.route('/', methods=['POST'])
def create_service():
# TODO what exceptions get passed from schema parsing?
Expand Down
Empty file removed app/service/views/__init__.py
Empty file.
5 changes: 0 additions & 5 deletions app/status/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +0,0 @@
from flask import Blueprint

status = Blueprint('status', __name__)

from app.status.views import healthcheck
5 changes: 3 additions & 2 deletions app/status/views/healthcheck.py → app/status/healthcheck.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
from flask import jsonify

from app.status import status
from flask import Blueprint
status = Blueprint('status', __name__)


@status.route('/_status')
def status():
def show_status():
return jsonify(
status="ok",
), 200
Empty file removed app/status/views/__init__.py
Empty file.
5 changes: 0 additions & 5 deletions app/template/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +0,0 @@
from flask import Blueprint

template = Blueprint('template', __name__)

from app.template import rest
12 changes: 4 additions & 8 deletions app/template/rest.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
from flask import (jsonify, request)
from flask import Blueprint
from flask import (jsonify)
from sqlalchemy.exc import DataError
from sqlalchemy.orm.exc import NoResultFound

from app.dao.templates_dao import get_model_templates
from app.dao.services_dao import get_model_services
from app.schemas import (template_schema, templates_schema)
from app import db

from flask import (jsonify, request)
from sqlalchemy.exc import DataError
from sqlalchemy.orm.exc import NoResultFound
from . import template
from app import db
template = Blueprint('template', __name__)


# I am going to keep these for admin like operations
Expand Down
5 changes: 0 additions & 5 deletions app/user/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +0,0 @@
from flask import Blueprint

user = Blueprint('user', __name__)

from app.user.views import rest
5 changes: 4 additions & 1 deletion app/user/views/rest.py → app/user/rest.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,13 @@
get_model_users, save_model_user, delete_model_user)
from app.schemas import (
user_schema, users_schema, service_schema, services_schema)
from .. import user
from app import db


from flask import Blueprint
user = Blueprint('user', __name__)


# TODO auth to be added
@user.route('/', methods=['POST'])
def create_user():
Expand Down
Empty file removed app/user/views/__init__.py
Empty file.