Tweak first published

microsoftgraph · Jan 12, 2023 · 2084567 · 2084567
1 parent 95073f4
commit 2084567
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/Models/SitePageFileInfo.cs b/src/Models/SitePageFileInfo.cs
@@ -61,9 +61,20 @@ public DateTimeOffset? FirstPublishedDateTime
         var firstPublishedDateJsonElement = GetListItemFieldElement("FirstPublishedDate");
         if (firstPublishedDateJsonElement.ValueKind == JsonValueKind.String)
         {
+          var firstPublishedDateString = firstPublishedDateJsonElement.ToString();
+          if (DateTimeOffset.TryParse(firstPublishedDateString, out var firstPublishedDate))
+          {
+            return firstPublishedDate;
+          }
+
           // we don't get a timezone offset. so forcing to utc
-          var forcedOffsetCreated = firstPublishedDateJsonElement.ToString() + "Z";
-          return DateTimeOffset.Parse(forcedOffsetCreated);
+          if (!firstPublishedDateString.EndsWith("Z"))
+          {
+            if (DateTimeOffset.TryParse($"{firstPublishedDateString}Z", out firstPublishedDate))
+            {
+              return firstPublishedDate;
+            }
+          }
         }
         return null;
       }

diff --git a/test/Mocks/GetSitePageResponse.json b/test/Mocks/GetSitePageResponse.json
@@ -28,7 +28,7 @@
     },
     "Description": "Make a difference ",
     "PromotedState": 0.0,
-    "FirstPublishedDate": "2022-05-25T16:07:42",
+    "FirstPublishedDate": "2022-05-25T16:07:42-08:00",
     "LayoutWebpartsContent": "",
     "OData__AuthorBylineId": null,
     "_AuthorBylineStringId": null,