fix: location

gitevents · Sep 5, 2024 · 13569bc · 13569bc
1 parent 8e1333c
commit 13569bc
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 20 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -98948,19 +98948,23 @@ var __webpack_exports__ = {}
             }
           }
 
-          if (locations && locations.length > 0) {
-            const locationLookup = locations.find((l) => l.id === location.id)
-            if (!locationLookup) {
-              event.location = location.text
-            } else {
-              event.location = locationLookup.name
-              if (locationLookup.geo) {
-                const [lat, lon] = locationLookup.geo
-                event.geo = { lat, lon }
+          if (location) {
+            if (locations && locations.length > 0) {
+              const locationLookup = locations.find((l) => l.id === location.id)
+              if (!locationLookup) {
+                event.location = location.text
+              } else {
+                event.location = locationLookup.name
+                if (locationLookup.geo) {
+                  const [lat, lon] = locationLookup.geo
+                  event.geo = { lat, lon }
+                }
               }
+            } else {
+              event.location = location.text ? location.text : ''
             }
           } else {
-            event.location = location.text ? location.text : ''
+            event.location = ''
           }
 
           events.push(event)

diff --git a/e2e/realworld.js b/e2e/realworld.js
@@ -0,0 +1,17 @@
+import github from '@actions/github'
+import { createIcs } from '../src/create-ics.js'
+import { fetchIssues } from '../src/fetch-issues.js'
+
+async function run() {
+  const repoToken = process.env.GH_TOKEN
+  const locationsFile = 'locations.json'
+  const timeZone = 'America/Denver'
+
+  const octokit = github.getOctokit(repoToken)
+
+  const events = await fetchIssues(octokit, locationsFile, timeZone)
+
+  await createIcs(events)
+}
+
+run()
diff --git a/src/fetch-issues.js b/src/fetch-issues.js
@@ -134,19 +134,23 @@ export async function fetchIssues(
           }
         }
 
-        if (locations && locations.length > 0) {
-          const locationLookup = locations.find((l) => l.id === location.id)
-          if (!locationLookup) {
-            event.location = location.text
-          } else {
-            event.location = locationLookup.name
-            if (locationLookup.geo) {
-              const [lat, lon] = locationLookup.geo
-              event.geo = { lat, lon }
+        if (location) {
+          if (locations && locations.length > 0) {
+            const locationLookup = locations.find((l) => l.id === location.id)
+            if (!locationLookup) {
+              event.location = location.text
+            } else {
+              event.location = locationLookup.name
+              if (locationLookup.geo) {
+                const [lat, lon] = locationLookup.geo
+                event.geo = { lat, lon }
+              }
             }
+          } else {
+            event.location = location.text ? location.text : ''
           }
         } else {
-          event.location = location.text ? location.text : ''
+          event.location = ''
         }
 
         events.push(event)