Merge pull request #1 from CallMeAlexO/refactor

Refactor

Author: CallMeAlexO

.gitignore

@@ -1,3 +1,5 @@
 flaskapp
-__pycache__ 
-uploads
+__pycache__
+error.log
+.idea
+*.pyc

Procfile

@@ -1 +1 @@
-web: gunicorn app:app
+web: gunicorn server:app

app.py

@@ -0,0 +1,22 @@
+from flask import Flask
+from config import Config
+from flask_sqlalchemy import SQLAlchemy
+import logging
+
+db = SQLAlchemy()
+log = logging
+
+
+def create_app(config_class=Config):
+    app = Flask(__name__)
+    app.config.from_object(config_class)
+
+    db.init_app(app)
+
+    from app.main import bp as main_bp
+    app.register_blueprint(main_bp)
+
+    from app.api import bp as api_bp
+    app.register_blueprint(api_bp, url_prefix='/api')
+
+    return app

app/__init__.py

@@ -0,0 +1,5 @@
+from flask import Blueprint
+
+bp = Blueprint('api', __name__)
+
+from app.api import experiments, materials, authors, batches

app/api/__init__.py

@@ -0,0 +1,52 @@
+from flask import jsonify, request, url_for, abort
+from app import db, log
+from app.models import Author
+from app.api import bp
+from sqlalchemy.exc import IntegrityError
+
+
+@bp.route('/authors/generate', methods=['GET'])
+def generate_authors():
+    log.debug(f"ENTER /authors/generate")
+    db.session.add(Author(name="Zeev Weisman", email="[email protected]"))
+    db.session.add(Author(name="Osheter Alexey", email="[email protected]"))
+    db.session.add(Author(name="Osheter Tatiana", email="[email protected]"))
+    db.session.add(Author(name="Campisi-Pinto Saro", email="[email protected]"))
+    db.session.add(Author(name="Ashkenazi Hen", email="[email protected]"))
+    db.session.add(Author(name="Abramowitz Janna", email="[email protected]"))
+    db.session.add(Author(name="Shoshana Kravchik", email="[email protected]"))
+
+    try:
+        db.session.commit()
+    except IntegrityError as e:
+        if "duplicate" in str(e.orig).lower():
+            return jsonify({"error": f"{e.params[0]} already exists in DB"})
+        else:
+            raise e
+
+    return jsonify(Author.query.get_or_404(1).to_dict())
+
+
+@bp.route('/authors/<int:id>', methods=['GET'])
+def get_author(id):
+    log.debug(f"ENTER /authors/id/{id}")
+    return jsonify(Author.query.get_or_404(id).to_dict())
+
+
+@bp.route('/authors', methods=['GET'])
+def get_authors():
+    log.debug(f"ENTER /authors")
+    page = request.args.get('page', 1, type=int)
+    per_page = min(request.args.get('per_page', 10, type=int), 100)
+    data = Author.to_collection_dict(Author.query, page, per_page, 'api.get_authors')
+    return jsonify(data)
+
+
+@bp.route('/authors/<int:id>/experiments', methods=['GET'])
+def get_author_experiments(id):
+    log.debug(f"ENTER /authors/{id}/experiments")
+    author = Author.query.get_or_404(id)
+    page = request.args.get('page', 1, type=int)
+    per_page = min(request.args.get('per_page', 10, type=int), 100)
+    data = Author.to_collection_dict(author.experiments, page, per_page, 'api.get_author_experiments', id=id)
+    return jsonify(data)

app/api/authors.py

@@ -0,0 +1,47 @@
+from flask import jsonify, request, url_for, abort
+from app import db, log
+from app.models import Author, Batch
+from app.api import bp
+from sqlalchemy.exc import IntegrityError
+
+
+@bp.route('/batches/generate', methods=['GET'])
+def generate_batches():
+    log.debug(f"ENTER /batches/generate")
+    b = Batch(name="OX-OILS-80DC-21-11-28")
+    db.session.add(b)
+
+    try:
+        db.session.commit()
+    except IntegrityError as e:
+        if "duplicate" in str(e.orig).lower():
+            return jsonify({"error": f"{e.params[0]} already exists in DB"})
+        else:
+            raise e
+
+    return jsonify(b.to_dict())
+
+
+@bp.route('/batches/<int:id>', methods=['GET'])
+def get_batch(id):
+    log.debug(f"ENTER /batches/id/{id}")
+    return jsonify(Batch.query.get_or_404(id).to_dict())
+
+
+@bp.route('/batches', methods=['GET'])
+def get_batches():
+    log.debug(f"ENTER /batches")
+    page = request.args.get('page', 1, type=int)
+    per_page = min(request.args.get('per_page', 10, type=int), 100)
+    data = Batch.to_collection_dict(Batch.query, page, per_page, 'api.get_batches')
+    return jsonify(data)
+
+
+@bp.route('/batches/<int:id>/experiments', methods=['GET'])
+def get_batch_experiments(id):
+    log.debug(f"ENTER /batches/{id}/experiments")
+    batch = Batch.query.get_or_404(id)
+    page = request.args.get('page', 1, type=int)
+    per_page = min(request.args.get('per_page', 10, type=int), 100)
+    data = Batch.to_collection_dict(batch.experiments, page, per_page, 'api.get_batch_experiments', id=id)
+    return jsonify(data)