Merge pull request #136 from matsumatsu20/bugfix/notification-own-comment

ALIS-1119: Don't create notifications when add comment on own articles.

Author: keillera

src/handlers/me/articles/comments/create/me_articles_comments_create.py

@@ -60,8 +60,9 @@ def exec_main_proc(self):
             article_info_table = self.dynamodb.Table(os.environ['ARTICLE_INFO_TABLE_NAME'])
             article_info = article_info_table.get_item(Key={'article_id': self.params['article_id']})['Item']
 
-            self.__create_comment_notification(article_info, comment_id, user_id)
-            self.__update_unread_notification_manager(article_info)
+            if self.__is_notifiable_comment(article_info, user_id):
+                self.__create_comment_notification(article_info, comment_id, user_id)
+                self.__update_unread_notification_manager(article_info)
 
         except Exception as err:
             logging.fatal(err)
@@ -72,6 +73,9 @@ def exec_main_proc(self):
                 'body': json.dumps({'comment_id': comment_id})
             }
 
+    def __is_notifiable_comment(self, article_info, user_id):
+        return False if article_info['user_id'] == user_id else True
+
     def __create_comment_notification(self, article_info, comment_id, user_id):
         notification_table = self.dynamodb.Table(os.environ['NOTIFICATION_TABLE_NAME'])
         notification_id = '-'.join(

tests/handlers/me/articles/comments/create/test_me_articles_comments_create.py

@@ -170,6 +170,45 @@ def test_main_ok_already_commented_by_myself(self):
         self.assertEqual(len(comment_after) - len(comment_before), 1)
         self.assertIsNotNone(comment)
 
+    @patch('me_articles_comments_create.MeArticlesCommentsCreate._MeArticlesCommentsCreate__generate_comment_id',
+           MagicMock(return_value='PIYOPIYO'))
+    def test_main_ok_with_adding_comment_on_own_article(self):
+        params = {
+            'pathParameters': {
+                'article_id': 'publicId0001'
+            },
+            'body': {
+                'text': 'A' * 400,
+            },
+            'requestContext': {
+                'authorizer': {
+                    'claims': {
+                        'cognito:username': 'article_user01'
+                    }
+                }
+            }
+        }
+
+        params['body'] = json.dumps(params['body'])
+
+        comment_before = self.comment_table.scan()['Items']
+        notification_before = self.notification_table.scan()['Items']
+        unread_notification_manager_before = self.unread_notification_manager_table.scan()['Items']
+
+        response = MeArticlesCommentsCreate(params, {}, self.dynamodb).main()
+
+        comment_after = self.comment_table.scan()['Items']
+        notification_after = self.notification_table.scan()['Items']
+        unread_notification_manager_after = self.unread_notification_manager_table.scan()['Items']
+
+        comment = self.comment_table.get_item(Key={'comment_id': 'PIYOPIYO'}).get('Item')
+
+        self.assertEqual(response['statusCode'], 200)
+        self.assertIsNotNone(comment)
+        self.assertEqual(len(comment_after) - len(comment_before), 1)
+        self.assertEqual(len(notification_after) - len(notification_before), 0)
+        self.assertEqual(len(unread_notification_manager_after) - len(unread_notification_manager_before), 0)
+
     def test_call_validate_comment_existence(self):
         params = {
             'pathParameters': {