Move API specific functions to api.py, fixe imports

canteeneo/__init__.py

@@ -18,4 +18,5 @@ db = SQLAlchemy(app)
 migrate = Migrate(app, db)
 
 import models
-import controllers
\ No newline at end of file
+import views
+import api
\ No newline at end of file

canteeneo/api.py

+from canteeneo import app
+from flask import jsonify, request
+from models import Dish, Stall, Location
+from datetime import datetime
+
+@app.route('/api/all')
+def all():
+    data = {'update_time': str(datetime.now()), 'dishes': [], 'stalls': [], 'locations': []}
+    for dish in Dish.query.all():
+        data['dishes'].append({
+            'id': dish.id,
+            'name': dish.name,
+            'price': dish.price,
+            'stall_id': dish.stall_id,
+            'image_path': dish.image_path
+        })
+    for stall in Stall.query.all():
+        data['stalls'].append({
+            'id': stall.id,
+            'name': stall.name
+        })
+    for loc in Location.query.all():
+        data['locations'].append({
+            'id': loc.id,
+            'name': loc.name
+        })
+
+    return jsonify(**data)
+
+@app.route('/api/search/dish')
+def search():
+    query = request.args.get('name')
+    result = Dish.query.filter(Dish.name.like("%" + query + "%")).all()
+    data = []
+    for dish in result:
+        data.append({
+            'id': dish.id,
+            'name': dish.name,
+            'price': dish.price,
+            'stall_name': dish.stall.name,
+            'image_path': dish.image_path
+        })
+    return jsonify(data)
\ No newline at end of file

canteeneo/views.py

@@ -202,46 +202,6 @@ def unauthorized():
     flash('You have to be logged in to view this page!')
     return redirect(url_for('login'))
 
-@app.route('/api/all')
-def all():
-    data = {'update_time': str(datetime.now()), 'dishes': [], 'stalls': [], 'locations': []}
-    for dish in Dish.query.all():
-        data['dishes'].append({
-            'id': dish.id,
-            'name': dish.name,
-            'price': dish.price,
-            'stall_id': dish.stall_id,
-            'image_path': dish.image_path
-        })
-    for stall in Stall.query.all():
-        data['stalls'].append({
-            'id': stall.id,
-            'name': stall.name
-        })
-    for loc in Location.query.all():
-        data['locations'].append({
-            'id': loc.id,
-            'name': loc.name
-        })
-
-    return jsonify(**data)
-
-@app.route('/api/search/dish')
-def search():
-    query = request.args.get('name')
-    result = Dish.query.filter(Dish.name.like("%" + query + "%")).all()
-    data = []
-    for dish in result:
-        data.append({
-            'id': dish.id,
-            'name': dish.name,
-            'price': dish.price,
-            'stall_name': dish.stall.name,
-            'image_path': dish.image_path
-        })
-    return jsonify(data)
-
-
 def flash_form_errors(form):
     for field, errors in form.errors.items():
         for error in errors: