Rename hunt_id_index to is_hunt_index

[turbot] / turbot / interaction.py

diff --git a/turbot/interaction.py b/turbot/interaction.py
index 8f94a064071674d75dc1a039ac2d273b2a72e33b..06181887beb3f1c6632dda3f21607c88aa5e6b9c 100644 (file)
--- a/turbot/interaction.py
+++ b/turbot/interaction.py
@@ -115,7 +115,7 @@ def new_hunt_submission(turb, payload, metadata):
                 {'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,
@@ -136,9 +136,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'
@@ -167,17 +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)
-    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)
@@ -400,18 +401,18 @@ def puzzle_submission(turb, payload, metadata):
     channel_id = response['channel']['id']
 
     # Insert the newly-created puzzle into the database
-    turb.table.put_item(
-        Item={
-            "PK": "hunt-{}".format(hunt_id),
-            "SK": "puzzle-{}".format(puzzle_id),
-            "puzzle_id": puzzle_id,
-            "channel_id": channel_id,
-            "solution": [],
-            "status": 'unsolved',
-            "name": name,
-            "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