X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=turbot%2Finteraction.py;h=b6fa7d7e12efc8cfd5c4809d3ea5ee91ef98413b;hb=ef8d8f359be149adbbdbeda88ec4b6bbbebf928e;hp=bb4b868179863d259c53044c3789667c95548a71;hpb=e80df93e84e6e20933431a48d2c248fe663a3fa3;p=turbot

diff --git a/turbot/interaction.py b/turbot/interaction.py
index bb4b868..b6fa7d7 100644
--- a/turbot/interaction.py
+++ b/turbot/interaction.py
@@ -1,5 +1,6 @@
 from slack.errors import SlackApiError
 from turbot.blocks import input_block, section_block, text_block
+from turbot.hunt import find_hunt_for_hunt_id
 import turbot.rot
 import turbot.sheets
 import turbot.slack
@@ -108,14 +109,14 @@ def new_hunt_submission(turb, payload, metadata):
         turb.table = turb.db.create_table(
             TableName='turbot',
             KeySchema=[
-                {'AttributeName': 'PK', 'KeyType': 'HASH'},
+                {'AttributeName': 'hunt_id', 'KeyType': 'HASH'},
                 {'AttributeName': 'SK', 'KeyType': 'RANGE'},
             ],
             AttributeDefinitions=[
-                {'AttributeName': 'PK', 'AttributeType': 'S'},
+                {'AttributeName': 'hunt_id', 'AttributeType': 'S'},
                 {'AttributeName': 'SK', 'AttributeType': 'S'},
                 {'AttributeName': 'channel_id', 'AttributeType': 'S'},
-                {'AttributeName': 'hunt_id', 'AttributeType': 'S'},
+                {'AttributeName': 'is_hunt', 'AttributeType': 'S'},
             ],
             ProvisionedThroughput={
                 'ReadCapacityUnits': 5,
@@ -136,9 +137,9 @@ def new_hunt_submission(turb, payload, metadata):
                     }
                 },
                 {
-                    'IndexName': 'hunt_id_index',
+                    'IndexName': 'is_hunt_index',
                     'KeySchema': [
-                        {'AttributeName': 'hunt_id', 'KeyType': 'HASH'}
+                        {'AttributeName': 'is_hunt', 'KeyType': 'HASH'}
                     ],
                     'Projection': {
                         'ProjectionType': 'ALL'
@@ -168,9 +169,9 @@ def new_hunt_submission(turb, payload, metadata):
     # (leaving it as non-active for now until the channel-created handler
     #  finishes fixing it up with a sheet and a companion table)
     item={
-        "PK": "hunt-{}".format(hunt_id),
-        "SK": "hunt-{}".format(hunt_id),
         "hunt_id": hunt_id,
+        "SK": "hunt-{}".format(hunt_id),
+        "is_hunt": hunt_id,
         "channel_id": channel_id,
         "active": False,
         "name": name,
@@ -286,23 +287,6 @@ def channel_is_hunt(turb, channel_id):
 
     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
 
@@ -401,7 +385,7 @@ def puzzle_submission(turb, payload, metadata):
 
     # Insert the newly-created puzzle into the database
     item={
-        "PK": "hunt-{}".format(hunt_id),
+        "hunt_id": hunt_id,
         "SK": "puzzle-{}".format(puzzle_id),
         "puzzle_id": puzzle_id,
         "channel_id": channel_id,