Handle common errors in events mail_reply controller

tracim/tracim/controllers/events.py

@@ -1,6 +1,8 @@
 import tg
 from tg import request
 from tg import RestController
+from sqlalchemy.orm.exc import NoResultFound
+
 from tracim.lib.content import ContentApi
 from tracim.lib.user import UserApi
 from tracim.model.data import ContentType
@@ -14,13 +16,24 @@ class EventsRestController(RestController):
     def post(self):
         json = request.json_body
         if 'token' in json and json['token'] == VALID_TOKEN_VALUE:
-            # TODO check json content
+            if 'user_mail' not in json or 'content_id' not in json:
+                return {'status': 'error',
+                        'error': 'bad json',}
             uapi = UserApi(None)
             # TODO support Empty result error
-            user = uapi.get_one_by_email(json['user_mail'])
+            try:
+                user = uapi.get_one_by_email(json['user_mail'])
+            except NoResultFound :
+                return {'status': 'error',
+                        'error': 'bad user mail',}
             api = ContentApi(user)
 
-            thread = api.get_one(json['content_id'],content_type=ContentType.Any)
+            try:
+                thread = api.get_one(json['content_id'],
+                                     content_type=ContentType.Any)
+            except NoResultFound :
+                return {'status': 'error',
+                        'error': 'bad content id',}
             # INFO - G.M - 2017-11-17
             # When content_id is a sub-elem of a main content like Comment,
             # Attach the thread to the main content.
@@ -28,10 +41,10 @@ class EventsRestController(RestController):
                 thread = thread.parent
             if thread.type == ContentType.Folder:
                 return {'status': 'error',
-                        'error': 'comment for folder not allowed'}
+                        'error': 'comment for folder not allowed',}
             api.create_comment(thread.workspace, thread,
                                json['payload']['content'], True)
+            return {'status': 'ok',}
         else:
             return {'status': 'error',
-                    'error': 'invalid token'}
-        return json
+                    'error': 'invalid token',}