Mypy fixes

ThePalaceProject · Jul 28, 2023 · 4b0cfcd · 4b0cfcd
1 parent d735181
commit 4b0cfcd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/core/model/time_tracking.py b/core/model/time_tracking.py
@@ -33,7 +33,9 @@ class IdentifierPlaytimeEntry(Base):
         ForeignKey("identifiers.id", onupdate="CASCADE", ondelete="CASCADE"),
         nullable=False,
     )
-    timestamp: Mapped[DateTime] = Column(DateTime(timezone=True), nullable=False)
+    timestamp: Mapped[datetime.datetime] = Column(
+        DateTime(timezone=True), nullable=False
+    )
     total_seconds_played = Column(
         Integer,
         CheckConstraint(
@@ -65,7 +67,7 @@ class IdentifierPlaytime(Base):
     identifier_str = Column(String, nullable=False)
 
     # This should be a per-minute datetime
-    timestamp: Mapped[DateTime] = Column(
+    timestamp: Mapped[datetime.datetime] = Column(
         DateTime(timezone=True),
         CheckConstraint(
             "extract(second from timestamp)::integer = 0",

diff --git a/tests/api/test_controller_playtime_entries.py b/tests/api/test_controller_playtime_entries.py
@@ -31,7 +31,7 @@ def test_track_playtime(self, circulation_fixture: CirculationControllerFixture)
         with circulation_fixture.request_context_with_library(
             "/", method="POST", json=data
         ):
-            flask.request.patron = patron
+            flask.request.patron = patron  # type: ignore
             response = circulation_fixture.manager.playtime_entries.track_playtimes(
                 identifier.type, identifier.identifier
             )
@@ -50,12 +50,14 @@ def test_track_playtime(self, circulation_fixture: CirculationControllerFixture)
             entry = get_one(
                 db.session, IdentifierPlaytimeEntry, tracking_id="tracking-id-0"
             )
+            assert entry is not None
             assert entry.total_seconds_played == 12
             assert entry.timestamp.isoformat() == "2000-01-01T12:00:00+00:00"
 
             entry = get_one(
                 db.session, IdentifierPlaytimeEntry, tracking_id="tracking-id-1"
             )
+            assert entry is not None
             assert entry.total_seconds_played == 17
             assert entry.timestamp.isoformat() == "2000-01-01T12:01:00+00:00"
 
@@ -69,7 +71,7 @@ def test_track_playtime_duplicate_id_ok(
         db.session.add(
             IdentifierPlaytimeEntry(
                 tracking_id="tracking-id-0",
-                timestamp="2000-01-01T12:00Z",
+                timestamp="2000-01-01T12:00Z",  # type: ignore
                 total_seconds_played=12,
                 identifier_id=identifier.id,
             )
@@ -92,7 +94,7 @@ def test_track_playtime_duplicate_id_ok(
         with circulation_fixture.request_context_with_library(
             "/", method="POST", json=data
         ):
-            flask.request.patron = patron
+            flask.request.patron = patron  # type: ignore
             response = circulation_fixture.manager.playtime_entries.track_playtimes(
                 identifier.type, identifier.identifier
             )
@@ -128,7 +130,7 @@ def test_track_playtime_failure(
         with circulation_fixture.request_context_with_library(
             "/", method="POST", json=data
         ):
-            flask.request.patron = patron
+            flask.request.patron = patron  # type: ignore
             with patch("api.controller.create") as mock_create:
                 mock_create.side_effect = IntegrityError(
                     "STATEMENT", {}, Exception("Fake Exception")