ADD error codes

aledruetta · aledruetta · commit 0c5fb4275664 · 2020-12-04T10:59:46.000-03:00
diff --git a/prototipo/projeto/ext/api/views.py b/prototipo/projeto/ext/api/views.py
@@ -4,11 +4,15 @@
 from flask_restful import Resource, reqparse
 
 from sqlalchemy.exc import IntegrityError
+from sqlalchemy.orm.exc import UnmappedInstanceError
 
 from projeto.ext.db import db
 
 from .models import Estacao, Sensor, Leitura
 
+HTTP_RESPONSE_CREATED = 201
+HTTP_RESPONSE_NOT_FOUND = 404
+
 
 class ApiEstacao(Resource):
     def get(self):
@@ -42,7 +46,7 @@ def post(self):
 
         db.session.add(estacao)
         db.session.commit()
-        return {"created": estacao.json()}
+        return {"created": estacao.json()}, HTTP_RESPONSE_CREATED
 
 
 class ApiEstacaoId(Resource):
@@ -52,7 +56,7 @@ def get(self, estacao_id):
             return {"resource": estacao.json()}
 
         except AttributeError:
-            return {"error": "Recurso inexistente!"}
+            return {"error": "Recurso inexistente!"}, HTTP_RESPONSE_NOT_FOUND
 
     # @jwt_required()
     def put(self, estacao_id):
@@ -77,7 +81,7 @@ def put(self, estacao_id):
             return {"updated": estacao.json()}
 
         except (AttributeError, IntegrityError):
-            return {"error": "Recurso inexistente!"}
+            return {"error": "Recurso inexistente!"}, HTTP_RESPONSE_NOT_FOUND
 
     # @jwt_required()
     def delete(self, estacao_id):
@@ -87,8 +91,8 @@ def delete(self, estacao_id):
             db.session.commit()
             return {"deleted": estacao.json()}
 
-        except IntegrityError:
-            return {"error": "Recurso inexistente!"}
+        except (IntegrityError, UnmappedInstanceError):
+            return {"error": "Recurso inexistente!"}, HTTP_RESPONSE_NOT_FOUND
 
 
 class ApiEstacaoIdSensor(Resource):
@@ -100,7 +104,7 @@ def get(self, estacao_id):
             return {"resources": data}
 
         except AttributeError:
-            return {"error": "Recurso inexistente!"}
+            return {"error": "Recurso inexistente!"}, HTTP_RESPONSE_NOT_FOUND
 
     # @jwt_required()
     def post(self, estacao_id):
@@ -129,10 +133,10 @@ def post(self, estacao_id):
             db.session.add(sensor)
             db.session.commit()
 
-            return {"created": sensor.json()}
+            return {"created": sensor.json()}, HTTP_RESPONSE_CREATED
 
         except IntegrityError:
-            return {"error": "Recurso inexistente!"}
+            return {"error": "Recurso inexistente!"}, HTTP_RESPONSE_NOT_FOUND
 
 
 class ApiSensorId(Resource):
@@ -142,7 +146,7 @@ def get(self, sensor_id):
             return {"resource": sensor.json()}
 
         except AttributeError:
-            return {"error": "Recurso inexistente!"}
+            return {"error": "Recurso inexistente!"}, HTTP_RESPONSE_NOT_FOUND
 
     # @jwt_required()
     def put(self, sensor_id):
@@ -168,7 +172,7 @@ def put(self, sensor_id):
             return {"updated": sensor.json()}
 
         except (AttributeError, IntegrityError):
-            return {"error": "Recurso inexistente!"}
+            return {"error": "Recurso inexistente!"}, HTTP_RESPONSE_NOT_FOUND
 
     # @jwt_required()
     def delete(self, sensor_id):
@@ -178,8 +182,8 @@ def delete(self, sensor_id):
             db.session.commit()
             return {"deleted": sensor.json()}
 
-        except IntegrityError:
-            return {"error": "Recurso inexistente!"}
+        except (IntegrityError, UnmappedInstanceError):
+            return {"error": "Recurso inexistente!"}, HTTP_RESPONSE_NOT_FOUND
 
 
 class ApiSensorIdParam(Resource):
@@ -193,7 +197,7 @@ def get(self, sensor_id, param):
             return {"resource": leituras}
 
         except AttributeError:
-            return {"error": "Recurso inexistente!"}
+            return {"error": "Recurso inexistente!"}, HTTP_RESPONSE_NOT_FOUND
 
     # @jwt_required()
     def post(self, sensor_id, param):
@@ -219,10 +223,10 @@ def post(self, sensor_id, param):
 
             db.session.add(leitura)
             db.session.commit()
-            return {"created": leitura.json()}
+            return {"created": leitura.json()}, HTTP_RESPONSE_CREATED
 
         except IntegrityError:
-            return {"error": "Recurso inexistente!"}
+            return {"error": "Recurso inexistente!"}, HTTP_RESPONSE_NOT_FOUND
 
 
 class ApiSensorIdParamLast(Resource):
@@ -239,4 +243,4 @@ def get(self, sensor_id, param, qty):
             return {"resources": []}
 
         except AttributeError:
-            return {"error": "Recurso inexistente!"}
+            return {"error": "Recurso inexistente!"}, HTTP_RESPONSE_NOT_FOUND
