Updated reload.js for events

Author: dhruvilmehta

pages/api/system/reload.js

@@ -195,70 +195,63 @@ export default async function handler(req, res) {
       }
 
       // - events
-      async function getCoordinates(city,state,country) {
-        const location = await fetch(
-          `https://nominatim.openstreetmap.org/?addressdetails=1&city=${city}&state=${state}&country=${country}&format=json&limit=1`
-        );
-        const coordinates = await location.json();
-        const final = {
-          lat: await coordinates[0].lat,
-          lon: await coordinates[0].lon,
-        };
-        return final;
-      }
-      try {
-        if (profile.events) {
-          await Profile.findOneAndUpdate(
-            { username: profile.username },
-            {
-              events: await Promise.all(
-                profile.events.map(async (event, position) => {
-                  let coordinates =
-                    event.location &&
-                    event.location.city &&
-                    event.location.state &&
-                    event.location.country
-                      ? await getCoordinates(
-                          event.location.city,
-                          event.location.state,
-                          event.location.country
-                        )
-                      : "";
-                  return {
-                    isVirtual: event.isVirtual,
-                    color: event.color,
-                    name: event.name,
-                    description: event.description,
-                    date: {
-                      start: event.date.start,
-                      end: event.date.end,
-                    },
-                    url: event.url,
-                    location: event.location
-                      ? {
-                          road: event.location.road ? event.location.road : "",
-                          city: event.location.city ? event.location.city : "",
-                          state: event.location.state
-                            ? event.location.state
-                            : "",
-                          country: event.location.country
-                            ? event.location.country
-                            : "",
-                          lat: event.location.city ? coordinates.lat : "",
-                          lon: event.location.city ? coordinates.lon : "",
-                        }
-                      : undefined,
-                    order: position,
-                    price: event.price,
-                  };
-                })
-              ),
-            }
+      async function getCoordinates(city, state, country) {
+        let locationDb = {};
+        const provided = [city, state, country].filter((x) => x).join(",");
+        if (locationDb[provided]) {
+          return locationDb[provided];
+        }
+        try {
+          const location = await fetch(
+            `https://nominatim.openstreetmap.org/?addressdetails=1&q=
+            ${encodeURIComponent(provided)}&format=json&limit=1`
           );
+          const coordinates = await location.json();
+          if (coordinates) {
+            const point = {
+              lat: coordinates[0].lat,
+              lon: coordinates[0].lon,
+            };
+            locationDb[provided] = point;
+            return point;
+          }
+        } catch (e) {
+          return null;
         }
-      } catch (e) {
-        logger.error(e, `failed to update events for ${profile.username}`);
+        return null;
       }
+      
+      const events = profile.events ? await Promise.all(
+        profile.events.map(async (event, position) => {
+          let location = {};
+          if (event.location) {
+            location = {
+              location: { ...event.location },
+            };
+            if (new Date(event.date.start) > Date.now() || new Date(event.date.end) > Date.now()) {
+              const coordinates = await getCoordinates(
+                event.location.city,
+                event.location.state,
+                event.location.country
+              );
+              if (coordinates) {
+                location.location.lat = coordinates.lat;
+                location.location.lon = coordinates.lon;
+              }
+            }
+          }
+          return {
+            order: position,
+            ...event,
+            ...location,
+          };
+        })
+      ): null;
+
+      await Profile.findOneAndUpdate(
+        { username: profile.username },
+        { events }
+      );
     })
   );