Use http status_code instead of json content for EventController

tracim/tracim/controllers/events.py

@@ -1,52 +1,56 @@
 import tg
 from tg import request
+from tg import abort
 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
+from tracim.config.app_cfg import CFG
 
 
 class EventRestController(RestController):
 
     @tg.expose('json')
     def post(self):
-        json = request.json_body
-
-        from tracim.config.app_cfg import CFG
+        try:
+            json = request.json_body
+        except:
+            abort(400,'Bad json')
         cfg = CFG.get_instance()
-
         if 'token' in json and json['token'] == cfg.EMAIL_REPLY_TOKEN:
-            if 'user_mail' not in json or 'content_id' not in json:
-                return {'status': 'error',
-                        'error': 'bad json', }
+            if 'user_mail' not in json:
+                abort(400,'Bad sson : user_mail is required.')
+            if 'content_id' not in json:
+                abort(400, 'Bad json : content_id is required.')
+            if  'payload' not in json:
+                abort(400, 'Bad json : payload is required.')
             uapi = UserApi(None)
-            # TODO support Empty result error
             try:
                 user = uapi.get_one_by_email(json['user_mail'])
             except NoResultFound:
-                return {'status': 'error',
-                        'error': 'bad user mail', }
+                abort(400,'Unknown user email.')
             api = ContentApi(user)
 
             try:
                 thread = api.get_one(json['content_id'],
                                      content_type=ContentType.Any)
             except NoResultFound:
-                return {'status': 'error',
-                        'error': 'bad content id', }
+                abort(400,'Unknown 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.
             if thread.type == ContentType.Comment:
                 thread = thread.parent
             if thread.type == ContentType.Folder:
-                return {'status': 'error',
-                        'error': 'comment for folder not allowed', }
-            api.create_comment(thread.workspace, thread,
-                               json['payload']['content'], True)
-            return {'status': 'ok', }
+                abort(400,'comment for folder not allowed')
+
+            if 'content' in json['payload']:
+                api.create_comment(thread.workspace, thread,
+                                   json['payload']['content'], True)
+                abort(204)
+            else:
+                abort(400,'No content to add new comment')
         else:
-            return {'status': 'error',
-                    'error': 'invalid token', }
+            abort(403)

tracim/tracim/lib/email_fetcher.py

@@ -282,18 +282,9 @@ class MailFetcher(object):
                    }}
             try:
                 r = requests.post(self.endpoint, json=msg)
-                response = r.json()
-                if 'status' not in response:
-                    log = 'bad response: {}'
-                    logger.error(self, log.format(str(response)))
-                else:
-                    if response['status'] == 'ok':
-                        pass
-                    elif response['status'] == 'error' and 'error' in response:
-                        log = 'error with email: {}'
-                        logger.error(self, log.format(str(response['error'])))
-                    else:
-                        log = 'Unknown error with email'
+                if r.status_code not in [200, 204]:
+                    log = 'bad status code response when sending mail to tracim: {}' # nopep8
+                    logger.error(self, log.format(str(r.status_code)))
             # TODO - G.M - Verify exception correctly works
             except requests.exceptions.Timeout:
                 log = 'Timeout error to transmit fetched mail to tracim : {}'