X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=turbot%2Fevents.py;h=4ea06841cb48d5f3427d0f67630ecc77b574839c;hb=75f458c3cda727eec38f65571db60e284893c2e7;hp=cae4ccfbb86b98bc07a4264b209b2e62974c73c6;hpb=0d1df2ea1359a09a59fc897323d2d0080fe1f86a;p=turbot

diff --git a/turbot/events.py b/turbot/events.py
index cae4ccf..4ea0684 100644
--- a/turbot/events.py
+++ b/turbot/events.py
@@ -2,7 +2,9 @@ from turbot.blocks import (
     section_block, text_block, button_block, actions_block, divider_block
 )
 from turbot.hunt import hunt_blocks, find_hunt_for_hunt_id
-from turbot.sheets import sheets_create, sheets_create_for_puzzle
+from turbot.sheets import (
+    sheets_create, sheets_create_for_puzzle, sheets_create_folder
+)
 from turbot.slack import slack_send_message, slack_channel_members
 from turbot.channel import channel_url
 from boto3.dynamodb.conditions import Key
@@ -121,28 +123,30 @@ def hunt_channel_created(turb, channel_name, channel_id):
     slack_send_message(
         turb.slack_client, channel_id,
         "Welcome to the channel for the {} hunt! ".format(hunt['name'])
-        + "Please wait a minute or two while I create some backend resources.")
+        + "Please wait a moment or two while I create some backend resources.")
 
-    # Create a sheet for the hunt
-    sheet = sheets_create(turb, hunt['name'])
+    # Create a new folder within Google drive for the hunt
+    hunt['folder_id'] = sheets_create_folder(turb, hunt['hunt_id'])
 
-    # Update the database with the URL of the sheet
+    # Create a sheet for the hunt
+    sheet = sheets_create(turb, hunt['name'], hunt['folder_id'])
     hunt['sheet_url'] = sheet['url']
-    turb.table.put_item(Item=hunt)
 
     # Message the channel with the URL of the sheet
     slack_send_message(turb.slack_client, channel_id,
                        "Sheet created for this hunt: {}".format(sheet['url']))
 
-    # Mark the hunt as active in the database
+    # Mark the hunt as active now
     hunt['active'] = True
+
+    # Update the database with all the changes we have made to the hunt
     turb.table.put_item(Item=hunt)
 
     # Message the hunt channel that the database is ready
     slack_send_message(
         turb.slack_client, channel_id,
         "Thank you for waiting. This hunt is now ready to begin! "
-        + "Use `/puzzle` to create puzzles for the hunt.")
+        + "Type `/puzzle new` to create puzzles for the hunt.")
 
     return lambda_success
 
@@ -187,6 +191,10 @@ def puzzle_channel_created(turb, channel_name, channel_id):
               .format(channel_id, puzzle['sheet_url']))
         return lambda_success
 
+    # We need hunt from the database to know which folder to create
+    # the sheet in.
+    hunt = find_hunt_for_hunt_id(turb, puzzle['hunt_id'])
+
     # Before launching into sheet creation, indicate that we're doing this
     # in the database. This way, if we take too long to create the sheet
     # and Slack retries the event, that next event will see this 'pending'
@@ -196,7 +204,7 @@ def puzzle_channel_created(turb, channel_name, channel_id):
     turb.table.put_item(Item=puzzle)
 
     # Create a sheet for the puzzle
-    sheet = sheets_create_for_puzzle(turb, puzzle)
+    sheet = sheets_create_for_puzzle(turb, puzzle, hunt['folder_id'])
 
     # Update the database with the URL of the sheet
     puzzle['sheet_url'] = sheet['url']