Treat Foursquare timestamps as UTC, closes #5

Author: simonw

swarm_to_sqlite/cli.py

@@ -13,14 +13,10 @@
 )
 @click.option("--token", envvar="FOURSQUARE_TOKEN", help="Foursquare OAuth token")
 @click.option(
-    "--load",
-    type=click.File(),
-    help="Load checkins from this JSON file on disk",
+    "--load", type=click.File(), help="Load checkins from this JSON file on disk"
 )
 @click.option(
-    "--save",
-    type=click.File("w"),
-    help="Save checkins to this JSON file on disk",
+    "--save", type=click.File("w"), help="Save checkins to this JSON file on disk"
 )
 @click.option("-s", "--silent", is_flag=True, help="Don't show progress bar")
 def cli(db_path, token, load, save, silent):

swarm_to_sqlite/utils.py

@@ -43,7 +43,7 @@ def save_checkin(checkin, db):
     else:
         checkin["sticker"] = None
 
-    checkin["created"] = datetime.datetime.fromtimestamp(
+    checkin["created"] = datetime.datetime.utcfromtimestamp(
         checkin["createdAt"]
     ).isoformat()
     checkin["source"] = db["sources"].lookup(checkin["source"])
@@ -77,7 +77,7 @@ def save_checkin(checkin, db):
     # Handle photos
     photos_table = db.table("photos", pk="id", foreign_keys=("user", "source"))
     for photo in photos:
-        photo["created"] = datetime.datetime.fromtimestamp(
+        photo["created"] = datetime.datetime.utcfromtimestamp(
             photo["createdAt"]
         ).isoformat()
         photo["source"] = db["sources"].lookup(photo["source"])
@@ -89,7 +89,9 @@ def save_checkin(checkin, db):
     # Handle posts
     posts_table = db.table("posts", pk="id")
     for post in posts:
-        post["created"] = datetime.datetime.fromtimestamp(post["createdAt"]).isoformat()
+        post["created"] = datetime.datetime.utcfromtimestamp(
+            post["createdAt"]
+        ).isoformat()
         post["post_source"] = (
             db["post_sources"].upsert(post.pop("source"), pk="id").last_pk
         )

tests/test_save_checkin.py

@@ -196,7 +196,7 @@ def test_photos(converted):
             "width": 1920,
             "height": 1440,
             "visibility": "public",
-            "created": "2018-07-01T04:48:19",
+            "created": "2018-07-01T02:48:19",
             "user": "15889193",
         },
         {
@@ -208,7 +208,7 @@ def test_photos(converted):
             "width": 1920,
             "height": 1440,
             "visibility": "public",
-            "created": "2018-07-01T04:50:35",
+            "created": "2018-07-01T02:50:35",
             "user": "15889193",
         },
         {
@@ -220,7 +220,7 @@ def test_photos(converted):
             "width": 1920,
             "height": 1440,
             "visibility": "public",
-            "created": "2018-07-01T04:50:37",
+            "created": "2018-07-01T02:50:37",
             "user": "15889193",
         },
     ] == photos
@@ -246,7 +246,7 @@ def test_posts(converted):
             "text": "The samosa chaat appetizer (easily enough for two or even four people) was a revelation - I've never tasted anything quite like it before, absolutely delicious. Chicken tika masala was amazing too.",
             "url": "https://foursquare.com/item/58994045668af77dae50b376",
             "contentId": "58994045668af77dae50b376",
-            "created": "2017-02-07T04:34:29",
+            "created": "2017-02-07T03:34:29",
             "post_source": "UJXJTUHR42CKGO54KXQWGUZJL3OJKMKMVHGJ1SWIOC5TRKAC",
             "checkin": "592b2cfe09e28339ac543fde",
         }
@@ -269,7 +269,7 @@ def test_view(converted):
     assert [
         {
             "id": "592b2cfe09e28339ac543fde",
-            "created": "2017-05-28T22:03:10",
+            "created": "2017-05-28T20:03:10",
             "venue_id": "453774dcf964a520bd3b1fe3",
             "venue_name": "Restaurant Name",
             "latitude": 38.456,
@@ -282,8 +282,8 @@ def test_view(converted):
     ] == list(converted["checkin_details"].rows)
     assert [
         {
-            "first": "2017-05-28T22:03:10",
-            "last": "2017-05-28T22:03:10",
+            "first": "2017-05-28T20:03:10",
+            "last": "2017-05-28T20:03:10",
             "count": 1,
             "venue_categories": "Category Name",
             "id": "453774dcf964a520bd3b1fe3",