]> git.cworth.org Git - turbot/blobdiff - turbot/interaction.py
Rename hunt_id_index to is_hunt_index
[turbot] / turbot / interaction.py
index d2514e5d6543878b58483e582eea381db24e3313..06181887beb3f1c6632dda3f21607c88aa5e6b9c 100644 (file)
@@ -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,32 @@ 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
+
+    Returns None if hunt ID is not found, otherwise a
+    dictionary with all fields from the hunt's row in the table,
+    (channel_id, active, hunt_id, name, url, sheet_url, etc.).
+
+    """
+    turbot_table = turb.db.Table("turbot")
+
+    response = turbot_table.get_item(Key={'PK': 'hunt-{}'.format(hunt_id)})
+
+    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
@@ -252,11 +312,11 @@ def find_hunt_for_channel(turb, channel_id, channel_name):
 
     Returns None if channel does not belong to a hunt, otherwise a
     dictionary with all fields from the hunt's row in the table,
-    (channel_id, active_, hun_id, name, url, sheet_url, etc.).
+    (channel_id, active, hunt_id, name, url, sheet_url, etc.).
 
     """
 
-    (hunt, _) = channel_is_hunt(turb, channel_id)
+    hunt = channel_is_hunt(turb, channel_id)
 
     if hunt:
         return hunt
@@ -265,18 +325,7 @@ def find_hunt_for_channel(turb, channel_id, channel_name):
     # puzzle channel with a hunt-id prefix.
     hunt_id = channel_name.split('-')[0]
 
-    hunts_table = turb.db.Table("hunts")
-
-    response = hunts_table.scan(
-        FilterExpression='hunt_id = :hunt_id',
-        ExpressionAttributeValues={':hunt_id': hunt_id}
-    )
-
-    if 'Items' in response and len(response['Items']):
-        item = response['Items'][0]
-        return item
-
-    return None
+    return find_hunt_for_hunt_id(turb, hunt_id)
 
 def puzzle(turb, body, args):
     """Implementation of the /puzzle command
@@ -349,31 +398,24 @@ 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,
-            "orig_channel_name": hunt_dash_channel,
-            "solution": [],
-            "status": 'unsolved',
-            "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
 
-def rename_channel_to_solved(turb, puzzle):
-    orig_channel_name = puzzle['orig_channel_name']
-    channel_id = puzzle['channel_id']
-    newName = orig_channel_name + '-solved'
-    turb.slack_client.conversations_rename(channel=channel_id,
-                                           name=newName)
-
 # XXX: This duplicates functionality eith events.py:set_channel_description
 def set_channel_topic(turb, puzzle):
     channel_id = puzzle['channel_id']
@@ -454,10 +496,10 @@ def solved(turb, body, args):
         "Puzzle mark solved by {}: `{}`".format(user_name, args))
 
     # Also report the solution to the hunt channel
-    (hunt, _) = get_table_item(turb, "hunts", "hunt_id", puzzle['hunt_id'])
+    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'])
     )
@@ -466,10 +508,16 @@ 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'
-    rename_channel_to_solved(turb, puzzle)
+    channel_name = "{}-{}-solved".format(
+        puzzle['hunt_id'],
+        puzzle['puzzle_id'])
+    turb.slack_client.conversations_rename(
+        channel=puzzle['channel_id'],
+        name=channel_name)
 
     return lambda_ok