[rocketchat] Patch for PR chaoss#882

obaroikoh · Jun 10, 2020 · 1185f9e · 1185f9e
1 parent 43d10d9
commit 1185f9e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/grimoire_elk/enriched/rocketchat.py b/grimoire_elk/enriched/rocketchat.py
@@ -105,6 +105,8 @@ def get_rich_item(self, item):
         eitem['id'] = message['_id']
         # parent exists in case message is a reply
         eitem['parent'] = message.get('parent', None)
+        # set default value for is_edited
+        eitem['is_edited'] = 0
 
         if 'u' in message and message['u']:
             author = message['u']
@@ -117,6 +119,7 @@ def get_rich_item(self, item):
             editor = message['editedBy']
             eitem['edited_by_username'] = editor.get('username', None)
             eitem['edited_by_user_id'] = editor.get('_id', None)
+            eitem['is_edited'] = 1
 
         if 'file' in message and message['file']:
             eitem['file_id'] = message['file'].get('_id', None)
@@ -144,6 +147,8 @@ def get_rich_item(self, item):
         if self.prjs_map:
             eitem.update(self.get_item_project(eitem))
 
+        eitem.update(self.get_grimoire_fields(item["metadata__updated_on"], "message"))
+
         self.add_repository_labels(eitem)
         self.add_metadata_filter_raw(eitem)
         return eitem
@@ -165,7 +170,7 @@ def __get_mentions(self, mentioned):
         rich_mentions = []
 
         for usr in mentioned:
-            if '_id' in usr.keys():
+            if '_id' in usr.keys() and 'name' in usr.keys():
                 rich_mentions.append({'username': usr['username'], 'id': usr['_id'],
                                       'name': usr['name']})