Merge pull request #115 from matsumatsu20/modify-feature-notification

keillera · web-flow · commit 0b7ddc29259d · 2018-06-15T00:13:09.000+09:00
Modify feature notification
diff --git a/database-template.yaml b/database-template.yaml
@@ -363,6 +363,18 @@ Resources:
           KeyType: HASH
         - AttributeName: sort_key
           KeyType: RANGE
+      GlobalSecondaryIndexes:
+        - IndexName: user_id-sort_key-index
+          KeySchema:
+            - AttributeName: user_id
+              KeyType: HASH
+            - AttributeName: sort_key
+              KeyType: RANGE
+          Projection:
+            ProjectionType: ALL
+          ProvisionedThroughput:
+            ReadCapacityUnits: !Ref MinDynamoReadCapacitty
+            WriteCapacityUnits: !Ref MinDynamoWriteCapacitty
       ProvisionedThroughput:
         ReadCapacityUnits: !Ref MinDynamoReadCapacitty
         WriteCapacityUnits: !Ref MinDynamoWriteCapacitty
diff --git a/database.yaml b/database.yaml
@@ -327,15 +327,27 @@ Resources:
     Type: AWS::DynamoDB::Table
     Properties:
       AttributeDefinitions:
+        - AttributeName: notification_id
+          AttributeType: S
         - AttributeName: user_id
           AttributeType: S
         - AttributeName: sort_key
           AttributeType: N
       KeySchema:
-        - AttributeName: user_id
+        - AttributeName: notification_id
           KeyType: HASH
-        - AttributeName: sort_key
-          KeyType: RANGE
+      GlobalSecondaryIndexes:
+        - IndexName: user_id-sort_key-index
+          KeySchema:
+            - AttributeName: user_id
+              KeyType: HASH
+            - AttributeName: sort_key
+              KeyType: RANGE
+          Projection:
+            ProjectionType: ALL
+          ProvisionedThroughput:
+            ReadCapacityUnits: 1
+            WriteCapacityUnits: 1
       ProvisionedThroughput:
         ReadCapacityUnits: 1
         WriteCapacityUnits: 1
diff --git a/src/common/settings.py b/src/common/settings.py
@@ -70,6 +70,10 @@
         'type': 'string',
         'maxLength': 100
     },
+    'notification_id': {
+        'type': 'string',
+        'maxLength': 80
+    }
 }
 
 article_recent_default_limit = 20
diff --git a/src/handlers/me/articles/like/create/me_articles_like_create.py b/src/handlers/me/articles/like/create/me_articles_like_create.py
@@ -5,6 +5,7 @@
 import json
 import logging
 import traceback
+from boto3.dynamodb.conditions import Key
 from db_util import DBUtil
 from botocore.exceptions import ClientError
 from lambda_base import LambdaBase
@@ -62,17 +63,35 @@ def exec_main_proc(self):
 
     def __create_like_notification(self, article_info):
         notification_table = self.dynamodb.Table(os.environ['NOTIFICATION_TABLE_NAME'])
+        notification_id = '-'.join([settings.LIKE_NOTIFICATION_TYPE, article_info['user_id'], article_info['article_id']])
+        notification = notification_table.get_item(Key={'notification_id': notification_id}).get('Item')
 
-        notification_table.put_item(Item={
-                'user_id': article_info['user_id'],
-                'article_id': article_info['article_id'],
-                'article_title': article_info['title'],
-                'sort_key': TimeUtil.generate_sort_key(),
-                'type': settings.LIKE_NOTIFICATION_TYPE,
-                'acted_user_id': self.event['requestContext']['authorizer']['claims']['cognito:username'],
-                'created_at': int(time.time())
-            }
-        )
+        liked_count = self.__get_article_likes_count()
+
+        if notification:
+            notification_table.update_item(
+                Key={
+                    'notification_id': notification_id
+                },
+                UpdateExpression="set sort_key = :sort_key, article_title = :article_title, liked_count = :liked_count",
+                ExpressionAttributeValues={
+                    ':sort_key': TimeUtil.generate_sort_key(),
+                    ':article_title': article_info['title'],
+                    ':liked_count': liked_count
+                }
+            )
+        else:
+            notification_table.put_item(Item={
+                    'notification_id': notification_id,
+                    'user_id': article_info['user_id'],
+                    'article_id': article_info['article_id'],
+                    'article_title': article_info['title'],
+                    'sort_key': TimeUtil.generate_sort_key(),
+                    'type': settings.LIKE_NOTIFICATION_TYPE,
+                    'liked_count': liked_count,
+                    'created_at': int(time.time())
+                }
+            )
 
     def __update_unread_notification_manager(self, article_info):
         unread_notification_manager_table = self.dynamodb.Table(os.environ['UNREAD_NOTIFICATION_MANAGER_TABLE_NAME'])
@@ -101,3 +120,13 @@ def __create_article_liked_user(self, article_liked_user_table):
     def __get_article_user_id(self, article_id):
         article_info_table = self.dynamodb.Table(os.environ['ARTICLE_INFO_TABLE_NAME'])
         return article_info_table.get_item(Key={'article_id': article_id}).get('Item').get('user_id')
+
+    def __get_article_likes_count(self):
+        query_params = {
+            'KeyConditionExpression': Key('article_id').eq(self.event['pathParameters']['article_id']),
+            'Select': 'COUNT'
+        }
+        article_liked_user_table = self.dynamodb.Table(os.environ['ARTICLE_LIKED_USER_TABLE_NAME'])
+        response = article_liked_user_table.query(**query_params)
+
+        return response['Count']
diff --git a/src/handlers/me/notifications/index/me_notifications_index.py b/src/handlers/me/notifications/index/me_notifications_index.py
@@ -15,6 +15,7 @@ def get_schema(self):
             'type': 'object',
             'properties': {
                 'limit': settings.parameters['limit'],
+                'notification_id': settings.parameters['notification_id'],
                 'sort_key': settings.parameters['sort_key']
             }
         }
@@ -33,12 +34,14 @@ def exec_main_proc(self):
 
         query_params = {
             'Limit': limit,
+            'IndexName': 'user_id-sort_key-index',
             'KeyConditionExpression': Key('user_id').eq(user_id),
             'ScanIndexForward': False
         }
 
-        if self.params.get('sort_key') is not None:
+        if self.params.get('notification_id') is not None and self.params.get('sort_key') is not None:
             LastEvaluatedKey = {
+                'notification_id': self.params.get('notification_id'),
                 'user_id': user_id,
                 'sort_key': int(self.params['sort_key'])
             }
diff --git a/tests/handlers/me/articles/like/create/test_me_articles_like_create.py b/tests/handlers/me/articles/like/create/test_me_articles_like_create.py
@@ -21,13 +21,23 @@ def setUp(self):
                 'sort_key': 1520150272000000
             },
             {
-                'article_id': 'testid000001',
-                'user_id': 'test02',
-                'sort_key': 1520150272000001
+                'article_id': 'testid000002',
+                'user_id': 'test03_01',
+                'sort_key': 1520150272000002
+            },
+            {
+                'article_id': 'testid000002',
+                'user_id': 'test03_02',
+                'sort_key': 1520150272000002
             },
             {
                 'article_id': 'testid000002',
-                'user_id': 'test03',
+                'user_id': 'test03_03',
+                'sort_key': 1520150272000002
+            },
+            {
+                'article_id': 'testid000002',
+                'user_id': 'test03_04',
                 'sort_key': 1520150272000002
             }
         ]
@@ -38,7 +48,7 @@ def setUp(self):
         )
 
         # create article_info_table
-        article_info_table_items = [
+        self.article_info_table_items = [
             {
                 'article_id': 'testid000000',
                 'title': 'title1',
@@ -55,19 +65,36 @@ def setUp(self):
             },
             {
                 'article_id': 'testid000002',
-                'title': 'title3',
-                'status': 'draft',
-                'user_id': 'article_user_id_01',
+                'title': 'title3_updated',
+                'status': 'public',
+                'user_id': 'article_user_id_02',
                 'sort_key': 1520150272000002
             }
         ]
         TestsUtil.create_table(
             self.dynamodb,
             os.environ['ARTICLE_INFO_TABLE_NAME'],
-            article_info_table_items
+            self.article_info_table_items
         )
 
-        TestsUtil.create_table(self.dynamodb, os.environ['NOTIFICATION_TABLE_NAME'], [])
+        self.notification_items = [
+            {
+                'notification_id': 'like-article_user_id_02-testid000002',
+                'user_id': 'article_user_id_02',
+                'sort_key': 1520150272000010,
+                'article_id': 'testid000002',
+                'article_title': 'title3',
+                'type': 'like',
+                'liked_count': 4,
+                'created_at': 1520150272
+            }
+        ]
+
+        TestsUtil.create_table(
+            self.dynamodb,
+            os.environ['NOTIFICATION_TABLE_NAME'],
+            self.notification_items
+        )
 
         self.unread_notification_manager_items = [
             {
@@ -93,7 +120,7 @@ def assert_bad_request(self, params):
     def test_main_ok_exist_article_id(self):
         params = {
             'pathParameters': {
-                'article_id': self.article_liked_user_table_items[0]['article_id']
+                'article_id': self.article_info_table_items[0]['article_id']
             },
             'requestContext': {
                 'authorizer': {
@@ -141,11 +168,11 @@ def test_main_ok_exist_article_id(self):
         ).get('Item')
         self.assertEqual(unread_notification_manager['unread'], True)
 
-    @patch('time.time', MagicMock(return_value=1520150272.000003))
+    @patch('time.time', MagicMock(return_value=1520150272.000015))
     def test_create_notification_and_unread_notification_manager(self):
         params = {
             'pathParameters': {
-                'article_id': self.article_liked_user_table_items[1]['article_id']
+                'article_id': self.article_info_table_items[1]['article_id']
             },
             'requestContext': {
                 'authorizer': {
@@ -168,34 +195,73 @@ def test_create_notification_and_unread_notification_manager(self):
         notification_after = notification_table.scan()['Items']
         unread_notification_manager_after = unread_notification_manager_table.scan()['Items']
 
-        expected_notifications = [
-            {
-                'user_id': 'article_user_id_01',
-                'sort_key': 1520150272000003,
-                'article_id': 'testid000001',
-                'article_title': 'title2',
-                'type': 'like',
-                'acted_user_id': 'test06',
-                'created_at': 1520150272
-            }
-        ]
+        expected_notification = {
+            'notification_id': 'like-article_user_id_01-testid000001',
+            'user_id': 'article_user_id_01',
+            'sort_key': 1520150272000015,
+            'article_id': 'testid000001',
+            'article_title': 'title2',
+            'type': 'like',
+            'liked_count': 1,
+            'created_at': 1520150272
+        }
 
+        notification = notification_table.get_item(Key={'notification_id': 'like-article_user_id_01-testid000001'}).get('Item')
         unread_notification_manager = unread_notification_manager_table.get_item(
             Key={'user_id': 'article_user_id_01'}
         ).get('Item')
 
         self.assertEqual(response['statusCode'], 200)
-        self.assertEqual(notification_after, expected_notifications)
+        self.assertEqual(notification, expected_notification)
         self.assertEqual(len(notification_after), len(notification_before) + 1)
         self.assertEqual(unread_notification_manager['unread'], True)
         self.assertEqual(len(unread_notification_manager_after), len(unread_notification_manager_before) + 1)
 
+    @patch('time.time', MagicMock(return_value=1520150272.000015))
+    def test_main_with_updating_notification(self):
+        params = {
+            'pathParameters': {
+                'article_id': self.article_info_table_items[2]['article_id']
+            },
+            'requestContext': {
+                'authorizer': {
+                    'claims': {
+                        'cognito:username': 'test06'
+                    }
+                }
+            }
+        }
+
+        notification_table = self.dynamodb.Table(os.environ['NOTIFICATION_TABLE_NAME'])
+        notification_before = notification_table.scan()['Items']
+
+        response = MeArticlesLikeCreate(event=params, context={}, dynamodb=self.dynamodb).main()
+
+        notification_after = notification_table.scan()['Items']
+
+        expected_notification = {
+            'notification_id': 'like-article_user_id_02-testid000002',
+            'user_id': 'article_user_id_02',
+            'sort_key': 1520150272000015,
+            'article_id': 'testid000002',
+            'article_title': 'title3_updated',
+            'type': 'like',
+            'liked_count': 5,
+            'created_at': 1520150272
+        }
+
+        notification = notification_table.get_item(Key={'notification_id': 'like-article_user_id_02-testid000002'}).get('Item')
+
+        self.assertEqual(response['statusCode'], 200)
+        self.assertEqual(notification, expected_notification)
+        self.assertEqual(len(notification_after), len(notification_before))
+
     @patch('me_articles_like_create.MeArticlesLikeCreate._MeArticlesLikeCreate__create_like_notification',
            MagicMock(side_effect=Exception()))
     def test_raise_exception_in_creating_notification(self):
         params = {
             'pathParameters': {
-                'article_id': self.article_liked_user_table_items[0]['article_id']
+                'article_id': self.article_info_table_items[0]['article_id']
             },
             'requestContext': {
                 'authorizer': {
diff --git a/tests/handlers/me/notifications/index/test_me_notifications_index.py b/tests/handlers/me/notifications/index/test_me_notifications_index.py

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ def get_schema(self):`
`15`	`15`	`'type': 'object',`
`16`	`16`	`'properties': {`
`17`	`17`	`'limit': settings.parameters['limit'],`
	`18`	`+ 'notification_id': settings.parameters['notification_id'],`
`18`	`19`	`'sort_key': settings.parameters['sort_key']`
`19`	`20`	`}`
`20`	`21`	`}`
`@@ -33,12 +34,14 @@ def exec_main_proc(self):`
`33`	`34`
`34`	`35`	`query_params = {`
`35`	`36`	`'Limit': limit,`
	`37`	`+ 'IndexName': 'user_id-sort_key-index',`
`36`	`38`	`'KeyConditionExpression': Key('user_id').eq(user_id),`
`37`	`39`	`'ScanIndexForward': False`
`38`	`40`	`}`
`39`	`41`
`40`		`- if self.params.get('sort_key') is not None:`
	`42`	`+ if self.params.get('notification_id') is not None and self.params.get('sort_key') is not None:`
`41`	`43`	`LastEvaluatedKey = {`
	`44`	`+ 'notification_id': self.params.get('notification_id'),`
`42`	`45`	`'user_id': user_id,`
`43`	`46`	`'sort_key': int(self.params['sort_key'])`
`44`	`47`	`}`