gatsby-core-theme 2.0.2 → 2.0.3

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [2.0.3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v2.0.2...v2.0.3) (2021-12-18)
+
+
+### Bug Fixes
+
+* fixed schedule for rage ppc ([02f910f](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/02f910f01b3ac1e9b442a1dc0a3e8f19466bac23))
+
+
+### Code Refactoring
+
+* remove unneeded check ([2201e4d](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/2201e4d14c17684a4f49e2035af99ace83b108b1))
+
+
+* Merge branch 'fix-build-schedule' into 'master' ([356b451](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/356b451459a126c41a6f27e0b0fcfbd300d45679))
+
 ## [2.0.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v2.0.1...v2.0.2) (2021-12-17)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Gatsby Theme NPM Package",
   "main": "index.js",
   "GATSBY_RECAPTCHA_SITEKEY": "6LfoyvMUAAAAAO4nl_MQnqHb4XdHxEiu5cXgIqeB",

package/src/helpers/events.js

@@ -48,30 +48,41 @@ export function convertTimeZone(event) {
   return { ...event, ...dateAttrs };
 }
 
+function updateSchedule(schedule) {
+  if (!schedule) {
+    return {};
+  }
+
+  return Object.keys(schedule).reduce((acc, key) => {
+    const { tournaments } = schedule[key] || {};
+    if (!tournaments && ['soccer', 'handball', 'tennis', 'cricket'].includes(key)) {
+      const value = updateSchedule(schedule[key]);
+      acc[key] = value;
+      return acc;
+    }
+    // else if schedule is normal format
+    const formattedTournaments = Object.keys(tournaments).reduce(
+      (tournamentAcc, currentTournamentKey) => {
+        const league = tournaments[currentTournamentKey];
+        const formattedEvents = league.events.map((event) => convertTimeZone(event));
+
+        tournamentAcc[currentTournamentKey] = { ...league, events: formattedEvents };
+        return tournamentAcc;
+      },
+      {}
+    );
+    acc[key] = { ...schedule[key], tournaments: formattedTournaments };
+    return acc;
+  }, {});
+}
+
 export function updateAllTimezones(relation) {
   const relationSchedule = relation?.schedule;
   const relationFeaturedEvents = relation?.featured_events;
   const relationShowcasedEvents = relation?.showcased_events;
 
   // formated timezone schedule
-  const schedule = relationSchedule
-    ? Object.keys(relationSchedule).reduce((acc, dateKey) => {
-        const { tournaments } = relationSchedule[dateKey] || {};
-
-        const formattedTournaments = Object.keys(tournaments).reduce(
-          (tournamentAcc, currentTournamentKey) => {
-            const league = tournaments[currentTournamentKey];
-            const formattedEvents = league.events.map((event) => convertTimeZone(event));
-            tournamentAcc[currentTournamentKey] = { ...league, events: formattedEvents };
-            return tournamentAcc;
-          },
-          {}
-        );
-
-        acc[dateKey] = { ...relation.schedule[dateKey], tournaments: formattedTournaments };
-        return acc;
-      }, {})
-    : {};
+  const schedule = updateSchedule(relationSchedule);
 
   // formated timezone featured events
   const featured_events = relationFeaturedEvents?.map((event) => convertTimeZone(event)) || [];