From ad8072c75268d693e791c28b750d1a226924ade0 Mon Sep 17 00:00:00 2001
From: Daniel Gregoire <daniel.gregoire@shortcut.com>
Date: Fri, 12 Apr 2024 13:27:04 -0400
Subject: [PATCH 1/2] [pivotal] Order col_map lexicographically

---
 pivotal-import/pivotal_import.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pivotal-import/pivotal_import.py b/pivotal-import/pivotal_import.py
index 91190d3..23bee1e 100644
--- a/pivotal-import/pivotal_import.py
+++ b/pivotal-import/pivotal_import.py
@@ -95,19 +95,19 @@ def parse_priority(priority):
 
 
 col_map = {
-    "id": "external_id",
-    "title": "name",
+    "accepted at": ("accepted_at", parse_date),
+    "created at": ("created_at", parse_date),
+    "current state": "pt_state",
+    "deadline": ("deadline", parse_date),
     "description": "description",
-    "type": "story_type",
     "estimate": ("estimate", int),
-    "priority": ("priority", parse_priority),
-    "current state": "pt_state",
+    "id": "external_id",
     "labels": ("labels", parse_labels),
-    "url": ("external_links", url_to_external_links),
-    "created at": ("created_at", parse_date),
-    "accepted at": ("accepted_at", parse_date),
-    "deadline": ("deadline", parse_date),
+    "priority": ("priority", parse_priority),
     "requested by": "requester",
+    "title": "name",
+    "type": "story_type",
+    "url": ("external_links", url_to_external_links),
 }
 
 nested_col_map = {

From 83684cfe7037b9161f5425cc5f08ea0dae154f61 Mon Sep 17 00:00:00 2001
From: Daniel Gregoire <daniel.gregoire@shortcut.com>
Date: Fri, 12 Apr 2024 13:27:24 -0400
Subject: [PATCH 2/2] [pivotal] Import the deadline field on (release) stories

Pivotal's export includes a Deadline entry for Pivotal Releases. This
importer was already importing releases as Shortcut stories, setting
their Shortcut story type to "chore", and labelling them as a
release. This commit ensures the deadline field is also imported and
set as the Shortcut Story's deadline.

Note that Shortcut stories of any type can have a deadline set, not
just releases, but Pivotal supports deadlines only on releases.
---
 pivotal-import/pivotal_import.py      | 1 +
 pivotal-import/pivotal_import_test.py | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/pivotal-import/pivotal_import.py b/pivotal-import/pivotal_import.py
index 23bee1e..a419430 100644
--- a/pivotal-import/pivotal_import.py
+++ b/pivotal-import/pivotal_import.py
@@ -130,6 +130,7 @@ def parse_priority(priority):
         "comments",
         "created_at",
         "custom_fields",
+        "deadline",
         "description",
         "estimate",
         "external_id",
diff --git a/pivotal-import/pivotal_import_test.py b/pivotal-import/pivotal_import_test.py
index d475651..ab0ebbe 100644
--- a/pivotal-import/pivotal_import_test.py
+++ b/pivotal-import/pivotal_import_test.py
@@ -392,6 +392,7 @@ def test_build_release():
     d = {
         "story_type": "release",
         "name": "A Release",
+        "deadline": "2014-10-15T00:00:00",
     }
 
     assert {
@@ -405,6 +406,7 @@ def test_build_release():
                 {"name": PIVOTAL_TO_SHORTCUT_RUN_LABEL},
                 {"name": PIVOTAL_RELEASE_TYPE_LABEL},
             ],
+            "deadline": "2014-10-15T00:00:00",
         },
         "parsed_row": d,
     } == build_entity(ctx, d)