X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=turbot%2Finteraction.py;h=06181887beb3f1c6632dda3f21607c88aa5e6b9c;hb=83cb7e7717f1407ecc525bcc290489b7ce2480b0;hp=94e8310ebd5ee03838cbf3a7f2b4496846a5bbe8;hpb=8ffca056fb60e37779fb9807ff64cb0b183e6d2f;p=turbot diff --git a/turbot/interaction.py b/turbot/interaction.py index 94e8310..0618188 100644 --- a/turbot/interaction.py +++ b/turbot/interaction.py @@ -7,6 +7,7 @@ import json import re import requests from botocore.exceptions import ClientError +from boto3.dynamodb.conditions import Key from turbot.slack import slack_send_message actions = {} @@ -95,32 +96,63 @@ def new_hunt_submission(turb, payload, metadata): "Hunt ID can only contain lowercase letters, " + "numbers, and underscores") - # Check to see if the hunts table exists - hunts_table = turb.db.Table("hunts") - + # Check to see if the turbot table exists try: - exists = hunts_table.table_status in ("CREATING", "UPDATING", - "ACTIVE") + exists = turb.table.table_status in ("CREATING", "UPDATING", + "ACTIVE") except ClientError: exists = False - # Create the hunts table if necessary. + # Create the turbot table if necessary. if not exists: - hunts_table = turb.db.create_table( - TableName='hunts', + turb.table = turb.db.create_table( + TableName='turbot', KeySchema=[ - {'AttributeName': 'channel_id', 'KeyType': 'HASH'}, + {'AttributeName': 'PK', 'KeyType': 'HASH'}, + {'AttributeName': 'SK', 'KeyType': 'RANGE'}, ], AttributeDefinitions=[ + {'AttributeName': 'PK', 'AttributeType': 'S'}, + {'AttributeName': 'SK', 'AttributeType': 'S'}, {'AttributeName': 'channel_id', 'AttributeType': 'S'}, + {'AttributeName': 'is_hunt', 'AttributeType': 'S'}, ], ProvisionedThroughput={ 'ReadCapacityUnits': 5, 'WriteCapacityUnits': 5 - } + }, + GlobalSecondaryIndexes=[ + { + 'IndexName': 'channel_id_index', + 'KeySchema': [ + {'AttributeName': 'channel_id', 'KeyType': 'HASH'} + ], + 'Projection': { + 'ProjectionType': 'ALL' + }, + 'ProvisionedThroughput': { + 'ReadCapacityUnits': 5, + 'WriteCapacityUnits': 5 + } + }, + { + 'IndexName': 'is_hunt_index', + 'KeySchema': [ + {'AttributeName': 'is_hunt', 'KeyType': 'HASH'} + ], + 'Projection': { + 'ProjectionType': 'ALL' + }, + 'ProvisionedThroughput': { + 'ReadCapacityUnits': 5, + 'WriteCapacityUnits': 5 + } + } + ] ) - return submission_error("hunt_id", - "Still bootstrapping hunts table. Try again.") + return submission_error( + "hunt_id", + "Still bootstrapping turbot table. Try again in a minute, please.") # Create a channel for the hunt try: @@ -135,15 +167,18 @@ def new_hunt_submission(turb, payload, metadata): # Insert the newly-created hunt into the database # (leaving it as non-active for now until the channel-created handler # finishes fixing it up with a sheet and a companion table) - hunts_table.put_item( - Item={ - 'channel_id': channel_id, - "active": False, - "name": name, - "hunt_id": hunt_id, - "url": url - } - ) + item={ + "PK": "hunt-{}".format(hunt_id), + "SK": "hunt-{}".format(hunt_id), + "is_hunt": hunt_id, + "hunt_id": hunt_id, + "channel_id": channel_id, + "active": False, + "name": name, + } + if url: + item['url'] = url + turb.table.put_item(Item=item) # Invite the initiating user to the channel turb.slack_client.conversations_invite(channel=channel_id, users=user_id) @@ -242,7 +277,15 @@ def channel_is_hunt(turb, channel_id): Returns a dict (filled with database entries) if there is a hunt for this channel, otherwise returns None.""" - return get_table_item(turb, "hunts", 'channel_id', channel_id) + response = turb.table.query( + IndexName = "channel_id_index", + KeyConditionExpression=Key("channel_id").eq(channel_id) + ) + + if 'Items' not in response: + return None + + return response['Items'][0] def find_hunt_for_hunt_id(turb, hunt_id): """Given a hunt ID find the database for for that hunt @@ -252,18 +295,14 @@ def find_hunt_for_hunt_id(turb, hunt_id): (channel_id, active, hunt_id, name, url, sheet_url, etc.). """ - hunts_table = turb.db.Table("hunts") - - response = hunts_table.scan( - FilterExpression='hunt_id = :hunt_id', - ExpressionAttributeValues={':hunt_id': hunt_id} - ) + turbot_table = turb.db.Table("turbot") - if 'Items' in response and len(response['Items']): - item = response['Items'][0] - return item + response = turbot_table.get_item(Key={'PK': 'hunt-{}'.format(hunt_id)}) - return None + if 'Item' in response: + return response['Item'] + else: + return None def find_hunt_for_channel(turb, channel_id, channel_name): """Given a channel ID/name find the id/name of the hunt for this channel @@ -277,7 +316,7 @@ def find_hunt_for_channel(turb, channel_id, channel_name): """ - (hunt, _) = channel_is_hunt(turb, channel_id) + hunt = channel_is_hunt(turb, channel_id) if hunt: return hunt @@ -359,21 +398,21 @@ def puzzle_submission(turb, payload, metadata): "Error creating Slack channel {}: {}" .format(hunt_dash_channel, e.response['error'])) - puzzle_channel_id = response['channel']['id'] + channel_id = response['channel']['id'] # Insert the newly-created puzzle into the database - table = turb.db.Table(hunt_id) - table.put_item( - Item={ - "channel_id": puzzle_channel_id, - "solution": [], - "status": 'unsolved', - "hunt_id": hunt_id, - "name": name, - "puzzle_id": puzzle_id, - "url": url, - } - ) + item={ + "PK": "hunt-{}".format(hunt_id), + "SK": "puzzle-{}".format(puzzle_id), + "puzzle_id": puzzle_id, + "channel_id": channel_id, + "solution": [], + "status": 'unsolved', + "name": name, + } + if url: + item['url'] = url + turb.table.put_item(Item=item) return lambda_ok @@ -460,7 +499,7 @@ def solved(turb, body, args): hunt = find_hunt_for_hunt_id(turb, puzzle['hunt_id']) slack_send_message( turb.slack_client, hunt['channel_id'], - "Puzzle '<{}|{}>' has been solved!".format( + "Puzzle <{}|{}> has been solved!".format( puzzle['channel_url'], puzzle['name']) ) @@ -469,7 +508,8 @@ def solved(turb, body, args): set_channel_topic(turb, puzzle) # And rename the sheet to prefix with "SOLVED: " - turbot.sheets.renameSheet(turb, puzzle['sheet_url'], 'SOLVED: ' + puzzle['name']) + turbot.sheets.renameSheet(turb, puzzle['sheet_url'], + 'SOLVED: ' + puzzle['name']) # Finally, rename the Slack channel to add the suffix '-solved' channel_name = "{}-{}-solved".format(