diff --git a/lib/get-user-event-tabs.js b/lib/get-user-event-tabs.js index 891ccbc..191dc7a 100644 --- a/lib/get-user-event-tabs.js +++ b/lib/get-user-event-tabs.js @@ -33,7 +33,7 @@ module.exports = async (context, token, graphUser) => { context.log('user tabs', userTabs) const tabEvents = await Promise.all(userTabs.map(async tab => { - const events = await getGraphEvents(context, token, userPrincipalName, tab.CalendarUrl) + const events = await getGraphEvents(context, token, userPrincipalName, tab.CalendarUrl, tab.DaysAhead) if (!events) { context.log.error(['events', userPrincipalName, 'err', `No events found for: ${tab.CalendarUrl}`]) return null // will be filtered out later diff --git a/lib/graph/get-graph-events.js b/lib/graph/get-graph-events.js index c28682e..35d2b38 100644 --- a/lib/graph/get-graph-events.js +++ b/lib/graph/get-graph-events.js @@ -2,7 +2,7 @@ const axios = require('axios').default const getGraphToken = require('./get-graph-token') const { graph: { user, events } } = require('../../config') -module.exports = async (context, token, userPrincipalName, graphUserUrl) => { +module.exports = async (context, token, userPrincipalName, graphUserUrl, daysAhead = 7) => { if (!token) { // If no token is provided - gather application graph token context.log(['events', 'get-graph-events', userPrincipalName, 'get-graph-token']) @@ -19,7 +19,7 @@ module.exports = async (context, token, userPrincipalName, graphUserUrl) => { const now = new Date() const oneWeek = new Date() - oneWeek.setDate(oneWeek.getDate() + 7) + oneWeek.setDate(oneWeek.getDate() + (isNaN(daysAhead) ? 7 : parseInt(daysAhead.toString()))) const { data } = await axios({ url: graphUrl, diff --git a/lib/graph/sharepoint/repack-sharepoint-item.js b/lib/graph/sharepoint/repack-sharepoint-item.js index c642bfa..b0f03d4 100644 --- a/lib/graph/sharepoint/repack-sharepoint-item.js +++ b/lib/graph/sharepoint/repack-sharepoint-item.js @@ -4,6 +4,7 @@ module.exports = ({ id, fields }) => { TabName: fields.Title, GroupID: fields.GroupID, CalendarUrl: fields.CalendarGraphURL, - SortOrder: fields.Sortorder + SortOrder: fields.Sortorder, + DaysAhead: fields.DaysAhead } }