diff --git a/os-app/task-d-events/controller-tests.js b/os-app/task-d-events/controller-tests.js index 57c1dac..39decb7 100644 --- a/os-app/task-d-events/controller-tests.js +++ b/os-app/task-d-events/controller-tests.js @@ -26,7 +26,7 @@ describe('ZDAEventURLFission', function test_ZDAEventURLFission() { it('returns string', function () { deepEqual(mod.ZDAEventURLFission(), mod.ZDAEventURLs().filter(function (e) { - return e.match(/q0wId4DZFlx7LCP/i); + return e.match(/fission/i); }).shift()); }); @@ -105,7 +105,7 @@ describe('_DataEventObjects', function test__DataEventObjects() { ZDAEventStart: new Date(), }, inputData); - return ``; + return ``; }; it('parses data', function () { @@ -118,7 +118,7 @@ describe('_DataEventObjects', function test__DataEventObjects() { ZDAEventName, ZDAEventStart, })), [{ - ZDAEventURL: require('OLSKLink').OLSKLinkRelativeURL(mod.ZDAEventURLFission(), '/' + ZDAEventURL), + ZDAEventURL, ZDAEventName, ZDAEventStart, }]); diff --git a/os-app/task-d-events/controller.js b/os-app/task-d-events/controller.js index b48e9be..266b4fb 100644 --- a/os-app/task-d-events/controller.js +++ b/os-app/task-d-events/controller.js @@ -47,7 +47,7 @@ const mod = { ZDAEventURLFission () { return mod.ZDAEventURLs().filter(function (e) { - return e.match(/q0wId4DZFlx7LCP/i); + return e.match(/fission/i); }).shift(); }, @@ -85,11 +85,11 @@ const mod = { }); }, [mod.ZDAEventURLFission()]: function () { - return (param2 ? JSON.parse(param2.split('').shift()).props.pageProps.initialData.events : []).map(function (e) { + return (param2 ? JSON.parse(param2.split('').shift()).props.pageProps.initialData.data.featured_items : []).map(function (e) { return { - ZDAEventURL: require('OLSKLink').OLSKLinkRelativeURL(param1, '/' + e.url), - ZDAEventName: e.name, - ZDAEventStart: new Date(e.start_at), + ZDAEventURL: e.event.url, + ZDAEventName: e.event.name, + ZDAEventStart: new Date(e.event.start_at), }; }); },