Merge pull request #13 from schoolofcode-me/add_error_propagation_to_section_5_and_6

Added error propagation

Author: jslvtr

section5/app.py

@@ -1,4 +1,4 @@
-from flask import Flask, request
+from flask import Flask
 from flask_restful import Api
 from flask_jwt import JWT
 
@@ -7,6 +7,7 @@
 from item import Item, ItemList
 
 app = Flask(__name__)
+app.config['PROPAGATE_EXCEPTIONS'] = True
 app.secret_key = 'jose'
 api = Api(app)
 

section5/item.py

@@ -2,6 +2,7 @@
 from flask_jwt import jwt_required
 import sqlite3
 
+
 class Item(Resource):
     TABLE_NAME = 'items'
 

section5/security.py

@@ -1,11 +1,13 @@
 from werkzeug.security import safe_str_cmp
 from user import User
 
+
 def authenticate(username, password):
     user = User.find_by_username(username)
     if user and safe_str_cmp(user.password, password):
         return user
 
+
 def identity(payload):
     user_id = payload['identity']
     return User.find_by_id(user_id)

section5/user.py

@@ -1,6 +1,7 @@
 import sqlite3
 from flask_restful import Resource, reqparse
 
+
 class User(Resource):
     TABLE_NAME = 'users'
 
@@ -47,15 +48,15 @@ class UserRegister(Resource):
 
     parser = reqparse.RequestParser()
     parser.add_argument('username',
-        type=str,
-        required=True,
-        help="This field cannot be left blank!"
-    )
+                        type=str,
+                        required=True,
+                        help="This field cannot be left blank!"
+                        )
     parser.add_argument('password',
-        type=str,
-        required=True,
-        help="This field cannot be left blank!"
-    )
+                        type=str,
+                        required=True,
+                        help="This field cannot be left blank!"
+                        )
 
     def post(self):
         data = UserRegister.parser.parse_args()

section6/app.py

@@ -10,13 +10,16 @@
 app = Flask(__name__)
 app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///data.db'
 app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
-app.secret_key = 'EiEiO'
+app.config['PROPAGATE_EXCEPTIONS'] = True
+app.secret_key = 'jose'
 api = Api(app)
 
+
 @app.before_first_request
 def create_tables():
     db.create_all()
 
+
 jwt = JWT(app, authenticate, identity)  # /auth
 
 api.add_resource(Store, '/store/<string:name>')

section6/models/item.py

@@ -1,5 +1,6 @@
 from db import db
 
+
 class ItemModel(db.Model):
     __tablename__ = 'items'
 

section6/models/store.py

@@ -1,5 +1,6 @@
 from db import db
 
+
 class StoreModel(db.Model):
     __tablename__ = 'stores'
 

section6/models/user.py

@@ -1,5 +1,6 @@
 from db import db
 
+
 class UserModel(db.Model):
     __tablename__ = 'users'
 

section6/resources/item.py

@@ -2,18 +2,19 @@
 from flask_jwt import jwt_required
 from models.item import ItemModel
 
+
 class Item(Resource):
     parser = reqparse.RequestParser()
     parser.add_argument('price',
-        type=float,
-        required=True,
-        help="This field cannot be left blank!"
-    )
+                        type=float,
+                        required=True,
+                        help="This field cannot be left blank!"
+                        )
     parser.add_argument('store_id',
-        type=int,
-        required=True,
-        help="Every item needs a store_id."
-    )
+                        type=int,
+                        required=True,
+                        help="Every item needs a store_id."
+                        )
 
     @jwt_required()
     def get(self, name):
@@ -28,7 +29,7 @@ def post(self, name):
 
         data = Item.parser.parse_args()
 
-        item = ItemModel(name, data['price'], data['store_id'])
+        item = ItemModel(name, **data)
 
         try:
             item.save_to_db()
@@ -41,8 +42,8 @@ def delete(self, name):
         item = ItemModel.find_by_name(name)
         if item:
             item.delete_from_db()
-
-        return {'message': 'Item deleted'}
+            return {'message': 'Item deleted.'}
+        return {'message': 'Item not found.'}, 404
 
     def put(self, name):
         data = Item.parser.parse_args()
@@ -52,12 +53,13 @@ def put(self, name):
         if item:
             item.price = data['price']
         else:
-            item = ItemModel(name, data['price'])
+            item = ItemModel(name, **data)
 
         item.save_to_db()
 
         return item.json()
 
+
 class ItemList(Resource):
     def get(self):
         return {'items': list(map(lambda x: x.json(), ItemModel.query.all()))}

section6/resources/store.py

@@ -1,6 +1,7 @@
-from flask_restful import Resource, reqparse
+from flask_restful import Resource
 from models.store import StoreModel
 
+
 class Store(Resource):
     def get(self, name):
         store = StoreModel.find_by_name(name)
@@ -27,6 +28,7 @@ def delete(self, name):
 
         return {'message': 'Store deleted'}
 
+
 class StoreList(Resource):
     def get(self):
         return {'stores': list(map(lambda x: x.json(), StoreModel.query.all()))}