bugfixes

Author: akhmerov

common.py

@@ -1,6 +1,7 @@
 from functools import lru_cache
 import os
 from time import time
+import json
 
 import jwt
 import requests
@@ -77,10 +78,11 @@ def all_meetings(user_id) -> list:
 
 
 def decode(response):
-    if response.status_code != 200:
+    if response.status_code > 299:  # Not OK
         raise RuntimeError(response.content.decode())
     return json.loads(response.content.decode())
 
+
 def api_query(method, endpoint, **params):
     return decode(method(
         MAILGUN_BASE_URL + endpoint,

researchseminarsdotorg.py

@@ -19,14 +19,16 @@
                            "order": 0,
                            "display": True}]}
 
+
 def find_seminar_series(series_id):
-    url = "https://researchseminars.org/api/0/search/series?series_id=%s"%series_id
+    url = f"https://researchseminars.org/api/0/search/series?series_id={series_id}"
     r = get(url)
     if r.status_code == 200:
         J = r.json()
         results = J["properties"]["results"]
         return (len(results) != 0)
 
+
 def create_seminar_series(payload, authorization):
     url = "https://researchseminars.org/api/0/save/series/"
     r = post(url, json=payload, headers={"authorization":authorization})
@@ -41,6 +43,7 @@ def create_seminar_series(payload, authorization):
     else:
         return False, ""
 
+
 def edit_seminar_series(name, payload, authorization):
     url = "https://researchseminars.org/api/0/save/series/"
     r = post(url, json=payload, headers={"authorization":authorization})
@@ -55,6 +58,7 @@ def edit_seminar_series(name, payload, authorization):
     else:
         return False, ""
 
+
 def add_talk_to_series(series_id, payload, authorization):
     url = "https://researchseminars.org/api/0/save/talk/"
     r = post(url, json=payload, headers={"authorization":authorization})
@@ -68,6 +72,7 @@ def add_talk_to_series(series_id, payload, authorization):
     else:
         return "", r.status_code
 
+
 def publish_to_researchseminars(talk):
     # talk should be provided in yaml format
     api_token = os.getenv("RESEARCHSEMINARS_API_TOKEN")

schedulezoomtalks.py

@@ -1,45 +1,52 @@
 import os
+import secrets
+from io import StringIO
+from typing import Tuple
+import datetime
+
 import github
 import requests
-import secrets
+from ruamel.yaml import YAML
+import jinja2
+import pytz
+
 import common
 from researchseminarsdotorg import publish_to_researchseminars
 from host_key_rotation import host_key
-from io import StringIO
-from ruamel.yaml import YAML
+
 
 ISSUE_RESPONSE_TEMPLATE = jinja2.Template(
-"""Hi again! I've now created a Zoom meeting for your talk, with meeting ID
+"""I've now created a Zoom meeting for your talk, with meeting ID
    {{ meeting_id }}. You'll receive a separate email with a host key.
 """)
 
 EMAIL_TEMPLATE = jinja2.Template(
 """Hi {{ author }},
 
-   A Zoom meeting has now been scheduled for your Speakers' Corner talk.
-   Five minutes before your timeslot starts, you and your audience will be
-   able to join the meeting. You will then be able to claim the host role by
-   using the host key below. After an hour the meeting will automatically
-   be terminated. Once the recording finishes processing, you will get the
-   opportunity to cut out parts of it.
+A Zoom meeting has now been scheduled for your Speakers' Corner talk.
+Five minutes before your timeslot starts, you and your audience will be
+able to join the meeting. You will then be able to claim the host role by
+using the host key below. After an hour the meeting will automatically
+be terminated. Once the recording finishes processing, you will get the
+opportunity to cut out parts of it.
 
-   Your meeting information:
-   Talk title: {{ meeting_talk_title }}
-   Date: {{ meeting_date }}
-   Time slot: {{ meeting_start }} - {{ meeting_end }}
+Your meeting information:
+Talk title: {{ meeting_talk_title }}
+Date: {{ meeting_date }}
+Time slot: {{ meeting_start }} - {{ meeting_end }}
 
-   Zoom link: {{ meeting_zoom_link }}
-   Host key: {{ meeting_host_key }}
+Zoom link: {{ meeting_zoom_link }}
+Host key: {{ meeting_host_key }}
 
-   Thank you in advance for contributing to the Speakers' Corner!
-   - The VSF team
-   """)
+Thank you in advance for contributing to the Speakers' Corner!
+- The VSF team
+""")
 
-def schedule_zoom_talk(talk) -> Tuple[string, string]:
+
+def schedule_zoom_talk(talk) -> Tuple[str, str]:
 
     # Form the talk registration body
-    request_body =
-    {
+    request_body = {
       "topic": "Speakers\' corner talk by %s"%(talk.get("name")),
       "type": 2, # Scheduled meeting
       "start_time": talk["time"],
@@ -83,42 +90,37 @@ def schedule_zoom_talk(talk) -> Tuple[string, string]:
     }
 
     # Create the meeting
-    response = zoom_request(
+    response = common.zoom_request(
         requests.post,
-        f"{common.ZOOM_API}users/{user_id}/meetings",
+        f"{common.ZOOM_API}users/{common.SPEAKERS_CORNER_USER_ID}/meetings",
         params={"body":request_body}
     )
 
-    if( response.status != 201 ):
-        return None
+    meeting_id = response["id"]
 
-    # Extract meeting id
-    meeting_id = response.id
-    # Register the speaker
-    register_speaker(meeting_id)
-    # Update the meeting registration questions
-    patch_registration_questions(meeting_id, talk)
-    # Update the registrants email notification
+    register_speaker(meeting_id, talk)
+    patch_registration_questions(meeting_id)
     patch_registration_notification(meeting_id)
 
-    return meeting_id, response.join_url
+    return meeting_id, response["registration_url"]
 
-def register_speaker(meeting_id, talk) -> int:
 
+def register_speaker(meeting_id, talk) -> int:
     request_payload = {
       "email": talk["email"],
-      "first_name": "talk["speaker_name"],
+      "first_name": talk["speaker_name"],
     }
 
     # Send request
-    response = zoom_request(
+    response = common.zoom_request(
         requests.post,
-        f"{common.ZOOM_API}users/{user_id}/meetings/{meeting_id}/registrants",
-        params={"body":request_body}
+        f"{common.ZOOM_API}users/{common.SPEAKERS_CORNER_USER_ID}/meetings/{meeting_id}/registrants",
+        params={"body": request_payload}
     )
 
     return response.status
 
+
 def patch_registration_questions(meeting_id) -> int:
 
     request_body = {
@@ -135,7 +137,7 @@ def patch_registration_questions(meeting_id) -> int:
             "title": "May we contact you about future Virtual Science Forum events?",
             "type": "single", # short or single
             "answers": ["Yes", "No"], # only single
-            "required": true
+            "required": True
           },
           {
             "title": "How did you hear about the Virtual Science Forum?",
@@ -144,20 +146,20 @@ def patch_registration_questions(meeting_id) -> int:
                         "One of the organizers",
                         "A colleague (not an organizer)",
                         "Other"],
-            "required": true
+            "required": True
           },
           {
             "title": "Please confirm you have read the participant instructions: \
                       http://virtualscienceforum.org/#/attendeeguide*",
             "type": "short", # short or single
-            "required": true
+            "required": True
           },
         ]
     }
 
-    response = zoom_request(
+    response = common.zoom_request(
         requests.patch,
-        f"{common.ZOOM_API}users/{user_id}/meetings/{meeting_id}/registrants/questions",
+        f"{common.ZOOM_API}users/{common.SPEAKERS_CORNER_USER_ID}/meetings/{meeting_id}/registrants/questions",
         params={"body":request_body}
     )
 
@@ -173,25 +175,22 @@ def patch_registration_notification(meeting_id) -> int:
     }
 
     # Create the meeting
-    response = zoom_request(
+    response = common.zoom_request(
         requests.patch,
-        f"{common.ZOOM_API}users/{user_id}/meetings/{meeting_id}",
+        f"{common.ZOOM_API}users/{common.SPEAKERS_CORNER_USER_ID}/meetings/{meeting_id}",
         params={"body":request_body}
     )
 
     return response.status
 
 def notify_issue_about_zoom_meeting(repo, talk):
-    issue_comment = ISSUE_RESPONSE_TEMPLATE.render(meeting_id=meeting_id)
+    issue_comment = ISSUE_RESPONSE_TEMPLATE.render(meeting_id=talk["meeting_id"])
 
-    try:
-        issue = repo.get_issue(number=talk["workflow_issue"])
-        issue.create_comment(issue_comment)
-    except:
-        print("Couldn't create issue comment. The content would have been: ")
-        print(issue_comment)
+    issue = repo.get_issue(number=talk["workflow_issue"])
+    issue.create_comment(issue_comment)
 
-def notify_author(talk, join_url) -> string:
+
+def notify_author(talk, join_url) -> str:
     # Get the host key
     meeting_host_key = host_key(talk["time"])
 
@@ -214,8 +213,8 @@ def notify_author(talk, join_url) -> string:
         "html": email_text,
     }
 
-    return api_query(
-        post,
+    return common.api_query(
+        requests.post,
         f"{common.MAILGUN_DOMAIN}messages",
         data=data
     )
@@ -229,8 +228,8 @@ def schedule_talks(repo, talks) -> int:
             continue
 
         meeting_id, join_url = schedule_zoom_talk(talk)
-        if( meetind_id ):
-            talk.get("zoom_meeting_id") = meeting_id
+        if meeting_id:
+            talk["zoom_meeting_id"] = meeting_id
             # Add this talk to researchseminars.org
             publish_to_researchseminars(talk)
             # Create comment in issue
@@ -262,7 +261,7 @@ def schedule_talks(repo, talks) -> int:
         yaml.dump(talks, serialized)
 
         repo.update_file(
-          TALKS_FILE, f"Added Zoom link{1} for {0} scheduled speakers\'"\
+          common.TALKS_FILE, f"Added Zoom link{1} for {0} scheduled speakers\'"\
                        "corner talk{1}".format(num_updated,'' if num_updated == 1 else 's'),
           serialized.getvalue(),
           sha=talks_data.sha,