Merge pull request #428 from keillera/ALIS-5769

Add users_articles_popular.

Author: hayago

database-template.yaml

@@ -17,6 +17,8 @@ Resources:
           AttributeType: N
         - AttributeName: sync_elasticsearch
           AttributeType: N
+        - AttributeName: popular_sort_key
+          AttributeType: N
       KeySchema:
         - AttributeName: article_id
           KeyType: HASH
@@ -51,6 +53,14 @@ Resources:
               KeyType: HASH
           Projection:
             ProjectionType: ALL
+        - IndexName: user_id-popular_sort_key-index
+          KeySchema:
+            - AttributeName: user_id
+              KeyType: HASH
+            - AttributeName: popular_sort_key
+              KeyType: RANGE
+          Projection:
+            ProjectionType: ALL
       BillingMode: PAY_PER_REQUEST
   ArticleContent:
     Type: AWS::DynamoDB::Table
@@ -765,4 +775,4 @@ Resources:
           KeyType: RANGE
       BillingMode: PAY_PER_REQUEST
       SSESpecification:
-        SSEEnabled: true
+        SSEEnabled: true

database.yaml

@@ -13,6 +13,8 @@ Resources:
           AttributeType: N
         - AttributeName: sync_elasticsearch
           AttributeType: N
+        - AttributeName: popular_sort_key
+          AttributeType: N
       KeySchema:
         - AttributeName: article_id
           KeyType: HASH
@@ -59,6 +61,17 @@ Resources:
           ProvisionedThroughput:
             ReadCapacityUnits: 2
             WriteCapacityUnits: 2
+        - IndexName: user_id-popular_sort_key-index
+          KeySchema:
+            - AttributeName: user_id
+              KeyType: HASH
+            - AttributeName: popular_sort_key
+              KeyType: RANGE
+          Projection:
+            ProjectionType: ALL
+          ProvisionedThroughput:
+            ReadCapacityUnits: 2
+            WriteCapacityUnits: 2
       ProvisionedThroughput:
           ReadCapacityUnits: 2
           WriteCapacityUnits: 2
@@ -872,4 +885,4 @@ Resources:
         ReadCapacityUnits: 1
         WriteCapacityUnits: 1
       SSESpecification:
-        Enabled: true
+        Enabled: true

function02-template.yaml

@@ -250,6 +250,22 @@ Resources:
       Timeout: 900
       TracingConfig:
         Mode: "Active"
+  UsersArticlesPopular:
+    Type: "AWS::Lambda::Function"
+    Properties:
+      Code: ./deploy/users_articles_popular.zip
+      Environment:
+        Variables:
+          ARTICLE_INFO_TABLE_NAME: !Ref ArticleInfoTableName
+      Handler: handler.lambda_handler
+      MemorySize: 3008
+      Role:
+        Fn::ImportValue:
+          Fn::Sub: "${AlisAppId}-LambdaRole"
+      Runtime: python3.6
+      Timeout: 900
+      TracingConfig:
+        Mode: "Active"
   UsersWalletAddressShow:
     Type: "AWS::Lambda::Function"
     Properties:
@@ -316,3 +332,7 @@ Outputs:
     Value: !GetAtt UsersWalletAddressShow.Arn
     Export:
       Name: !Sub "${AlisAppId}-UsersWalletAddressShow"
+  UsersArticlesPopular:
+    Value: !GetAtt UsersArticlesPopular.Arn
+    Export:
+      Name: !Sub "${AlisAppId}-UsersArticlesPopular"

src/common/settings.py

@@ -6,6 +6,11 @@
         'minimum': 1,
         'maximum': 100
     },
+    'popular_sort_key': {
+        'type': 'number',
+        'minimum': 0,
+        'maximum': 10 ** 30
+    },
     'article_id': {
         'type': 'string',
         'minLength': 12,
@@ -281,6 +286,7 @@
 ARTICLES_TIP_RAKING_DEFAULT_LIMIT = 20
 
 USERS_ARTICLE_INDEX_DEFAULT_LIMIT = 10
+USERS_ARTICLE_POPULAR_INDEX_DEFAULT_LIMIT = 3
 NOTIFICATION_INDEX_DEFAULT_LIMIT = 10
 COMMENT_INDEX_DEFAULT_LIMIT = 10
 TAG_SEARCH_DEFAULT_LIMIT = 100

src/handlers/users/articles/popular/handler.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+import boto3
+from users_articles_popular import UsersArticlesPopular
+
+dynamodb = boto3.resource('dynamodb')
+
+
+def lambda_handler(event, context):
+    users_articles_popular = UsersArticlesPopular(event, context, dynamodb)
+    return users_articles_popular.main()

src/handlers/users/articles/popular/users_articles_popular.py

@@ -0,0 +1,85 @@
+import os
+import json
+import settings
+from lambda_base import LambdaBase
+from boto3.dynamodb.conditions import Key, Attr
+from jsonschema import validate
+from decimal_encoder import DecimalEncoder
+from parameter_util import ParameterUtil
+
+
+class UsersArticlesPopular(LambdaBase):
+    def get_schema(self):
+        return {
+            'type': 'object',
+            'properties': {
+                'user_id': settings.parameters['user_id'],
+                'limit': settings.parameters['limit'],
+                'article_id': settings.parameters['article_id'],
+                'popular_sort_key': settings.parameters['popular_sort_key']
+            },
+            'required': ['user_id']
+        }
+
+    def validate_params(self):
+        ParameterUtil.cast_parameter_to_int(self.params, self.get_schema())
+        validate(self.params, self.get_schema())
+
+    def exec_main_proc(self):
+        article_info_table = self.dynamodb.Table(os.environ['ARTICLE_INFO_TABLE_NAME'])
+        limit = UsersArticlesPopular.get_index_limit(self.params)
+
+        query_params = {
+            'Limit': limit,
+            'IndexName': 'user_id-popular_sort_key-index',
+            'KeyConditionExpression': Key('user_id').eq(self.params['user_id']),
+            'FilterExpression': Attr('status').eq('public'),
+            'ScanIndexForward': False
+        }
+
+        if UsersArticlesPopular.require_last_evaluated_key(self.params):
+            last_evaluated_key = {
+                'user_id': self.params['user_id'],
+                'article_id': self.params['article_id'],
+                'popular_sort_key': int(self.params['popular_sort_key'])
+            }
+
+            query_params.update({'ExclusiveStartKey': last_evaluated_key})
+
+        response = article_info_table.query(**query_params)
+
+        items = response['Items']
+
+        while 'LastEvaluatedKey' in response and len(response['Items']) < limit:
+            query_params.update({'ExclusiveStartKey': response['LastEvaluatedKey']})
+            response = article_info_table.query(**query_params)
+            items.extend(response['Items'])
+
+            if len(items) >= limit:
+                last_evaluated_key = {
+                    'user_id': self.params['user_id'],
+                    'article_id': items[limit - 1]['article_id'],
+                    'popular_sort_key': int(items[limit - 1]['popular_sort_key'])
+                }
+                response.update({'LastEvaluatedKey': last_evaluated_key})
+                break
+
+        response['Items'] = items[:limit]
+
+        return {
+            'statusCode': 200,
+            'body': json.dumps(response, cls=DecimalEncoder)
+        }
+
+    @staticmethod
+    def get_index_limit(params):
+        if params is not None and params.get('limit') is not None:
+            return int(params.get('limit'))
+        else:
+            return settings.USERS_ARTICLE_POPULAR_INDEX_DEFAULT_LIMIT
+
+    @staticmethod
+    def require_last_evaluated_key(params):
+        if params.get('article_id') is not None and params.get('popular_sort_key') is not None:
+            return True
+        return False