X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=turbot%2Fevents.py;h=8f9f12c4d4d130c45ed57f9dafa19b258587cf82;hb=c267061f2ba8826b35bb3f0a467b7585838fccf0;hp=bf4154ffafce8124388c80442ec0fbe630821e06;hpb=0076b5c890b0a6cfb61dac56f94e71566c669bc2;p=turbot

diff --git a/turbot/events.py b/turbot/events.py
index bf4154f..8f9f12c 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
@@ -45,7 +47,7 @@ def home(turb, user_id):
             continue
         if user_id in slack_channel_members(turb.slack_client,
                                             hunt['channel_id']):
-            my_hunt_blocks += hunt_blocks(turb, hunt)
+            my_hunt_blocks += hunt_blocks(turb, hunt, puzzle_status='all')
         else:
             available_hunt_blocks.append(hunt_link_block(turb, hunt))
 
@@ -103,40 +105,42 @@ def hunt_channel_created(turb, channel_name, channel_id):
               .format(channel_id) + "Letting Slack retry this event")
         return lambda_error
 
-    item = response['Items'][0]
+    hunt = response['Items'][0]
 
-    if 'sheet_url' in item:
+    if 'sheet_url' in hunt:
         print("Info: channel_id {} already has sheet_url {}. Exiting."
-              .format(channel_id, item['sheet_url']))
+              .format(channel_id, hunt['sheet_url']))
         return lambda_success
 
     # 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'
     # string and cleanly return (eliminating all future retries).
-    item['sheet_url'] = 'pending'
-    turb.table.put_item(Item=item)
+    hunt['sheet_url'] = 'pending'
+    turb.table.put_item(Item=hunt)
 
     # Also, let the channel users know what we are up to
     slack_send_message(
         turb.slack_client, channel_id,
-        "Welcome to the channel for the {} hunt! ".format(item['name'])
+        "Welcome to the channel for the {} hunt! ".format(hunt['name'])
         + "Please wait a minute or two while I create some backend resources.")
 
-    # Create a sheet for the hunt
-    sheet = sheets_create(turb, item['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
-    item['sheet_url'] = sheet['url']
-    turb.table.put_item(Item=item)
+    # Create a sheet for the hunt
+    sheet = sheets_create(turb, hunt['name'], hunt['folder_id'])
+    hunt['sheet_url'] = sheet['url']
 
     # 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
-    item['active'] = True
-    turb.table.put_item(Item=item)
+    # 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(