Merge branch 'dev' into issue/stage-direction-hangover

Author: Tim020

server/controllers/api/show/script/revisions.py

@@ -1,5 +1,5 @@
 import os
-from datetime import datetime
+from datetime import UTC, datetime
 
 from sqlalchemy import func, select
 from tornado import escape
@@ -113,7 +113,7 @@ async def post(self):
                     await self.finish({"message": "Description missing"})
                     return
 
-                now_time = datetime.utcnow()
+                now_time = datetime.now(UTC)
                 new_rev = ScriptRevision(
                     script_id=script.id,
                     revision=max_rev + 1,

server/controllers/api/show/script/script.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import UTC, datetime
 from functools import partial
 from typing import List, Optional
 
@@ -257,7 +257,7 @@ async def post(self):
                     previous_line = line_revision
 
                 # Update the revision edit time
-                revision.edited_at = datetime.utcnow()
+                revision.edited_at = datetime.now(UTC)
 
                 # Save everything to the DB
                 session.commit()

server/controllers/api/show/sessions.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import UTC, datetime
 
 from sqlalchemy import select
 from tornado import escape
@@ -88,7 +88,7 @@ async def post(self):
 
                     show_session = ShowSession(
                         show_id=show_id,
-                        start_date_time=datetime.utcnow(),
+                        start_date_time=datetime.now(UTC),
                         end_date_time=None,
                         client_internal_id=user_session.internal_id,
                         user_id=user_session.user.id,
@@ -129,7 +129,7 @@ async def post(self):
                     show_session: ShowSession = session.get(
                         ShowSession, show.current_session_id
                     )
-                    show_session.end_date_time = datetime.utcnow()
+                    show_session.end_date_time = datetime.now(UTC)
                     show.current_session_id = None
                     session.commit()
 

server/controllers/api/show/shows.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import UTC, datetime
 
 from dateutil import parser
 from sqlalchemy import select
@@ -84,7 +84,7 @@ async def post(self):
             return
 
         with self.make_session() as session:
-            now_time = datetime.utcnow()
+            now_time = datetime.now(UTC)
             show = Show(
                 name=show_name,
                 start_date=start_date,
@@ -208,7 +208,7 @@ async def patch(self):
                 # First act
                 show.first_act_id = data.get("first_act_id", None)
 
-                show.edited_at = datetime.utcnow()
+                show.edited_at = datetime.now(UTC)
                 session.commit()
 
                 self.set_status(200)