import re
import requests
from botocore.exceptions import ClientError
+from boto3.dynamodb.conditions import Key
from turbot.slack import slack_send_message
actions = {}
{'AttributeName': 'PK', 'AttributeType': 'S'},
{'AttributeName': 'SK', 'AttributeType': 'S'},
{'AttributeName': 'channel_id', 'AttributeType': 'S'},
- {'AttributeName': 'hunt_id', 'AttributeType': 'S'},
+ {'AttributeName': 'is_hunt', 'AttributeType': 'S'},
],
ProvisionedThroughput={
'ReadCapacityUnits': 5,
}
},
{
- 'IndexName': 'hunt_id_index',
+ 'IndexName': 'is_hunt_index',
'KeySchema': [
- {'AttributeName': 'hunt_id', 'KeyType': 'HASH'}
+ {'AttributeName': 'is_hunt', 'KeyType': 'HASH'}
],
'Projection': {
'ProjectionType': 'ALL'
}
]
)
- return submission_error("hunt_id",
- "Still bootstrapping turbot 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:
# 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)
- turb.table.put_item(
- Item={
- "PK": "hunt-{}".format(hunt_id),
- "SK": "hunt-{}".format(hunt_id),
- "hunt_id": hunt_id,
- "channel_id": channel_id,
- "active": False,
- "name": name,
- "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)
Returns a dict (filled with database entries) if there is a hunt
for this channel, otherwise returns None."""
- return get_table_item(turb, "channel_id_index", '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
"""
- (hunt, _) = channel_is_hunt(turb, channel_id)
+ hunt = channel_is_hunt(turb, channel_id)
if hunt:
return hunt
"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