Remove code (previously disabled) to invite users to new puzzle channel

[turbot] / turbot / interaction.py

diff --git a/turbot/interaction.py b/turbot/interaction.py
index 62199eb5725adc7aff4d4398d5a86ec6542cf1fe..b6fa7d7e12efc8cfd5c4809d3ea5ee91ef98413b 100644 (file)
--- 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
@@ -7,6 +8,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 = {}
@@ -107,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,
@@ -135,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'
@@ -166,17 +168,17 @@ 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={
+        "hunt_id": hunt_id,
+        "SK": "hunt-{}".format(hunt_id),
+        "is_hunt": 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)
@@ -275,25 +277,16 @@ 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, "channel_id_index", 'channel_id', channel_id)
-
-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)})
+    response = turb.table.query(
+        IndexName = "channel_id_index",
+        KeyConditionExpression=Key("channel_id").eq(channel_id)
+    )
 
-    if 'Item' in response:
-        return response['Item']
-    else:
+    if 'Items' not in response:
         return None
 
+    return response['Items'][0]
+
 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
 
@@ -306,7 +299,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
@@ -388,21 +381,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={
+        "hunt_id": 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