Update v2.4.0

config.js

@@ -13,7 +13,7 @@ config.webapp = {
 }
 
 config.deck = {
-  url: process.env.CANNON_EVENTDECK_URL || 'https://deck.sinfo.org'
+  url: process.env.CANNON_EVENTDECK_URL || 'https://deck.sinfo.org/api'
 }
 
 config.upload = {

server/db/promo-code.js

@@ -3,7 +3,10 @@ const mongoose = require('mongoose')
 const schema = new mongoose.Schema({
   company: String,
   edition: String,
-  expire: Date,
+  validity: {
+    from: Date,
+    to: Date
+  },
   description: String,
   code: String
 })

server/resources/deck.js

@@ -16,7 +16,7 @@ server.method('deck.getSession', getSession, {})
 server.method('deck.getSpeakers', getSpeakers, {})
 server.method('deck.getSpeaker', getSpeaker, {})
 
-const DECK_API_URL = `${config.deck.url}/api`
+const DECK_API_URL = `${config.deck.url}`
 
 async function getLatestEdition() {
   const event = await axios.get(`${DECK_API_URL}/public/events?current=true`, { json: true })
@@ -91,12 +91,13 @@ async function getSpeaker(speakerId) {
 // Translate Deck's event object to old format
 function transformEvent(event, options) {
   return {
-    id: event.id,
+    id: String(event.id),
     name: event.name,
     kind: options?.kind || "Main Event",
     public: options?.public || true,
     date: event.begin,
     duration: new Date(new Date(event.end) - new Date(event.begin)),
+    calendarUrl: event.calendarUrl
   }
 }
 
@@ -117,6 +118,7 @@ function transformCompany(company, options) {
     id: company.id,
     name: company.name,
     img: company.img,
+    site: company.site,
     description: company.description,
     advertisementLvl: options?.compact ? advertisementLvl : {
       advertisementLvl,
@@ -147,7 +149,7 @@ function transformSession(session, options) {
     name: session.title,
     description: session.description,
     kind: sessionKinds[session.kind] || session.kind,
-    event: options?.event || (session.company?.participation?.length > 0 && session.company.participation[0].event),
+    event: String(options?.event || (session.company?.participation?.length > 0 && session.company.participation[0].event)),
     date: session.begin,
     duration: new Date(new Date(session.end) - new Date(session.begin)),
     place: session.place,

server/resources/promo-code.js

@@ -8,8 +8,13 @@ server.method('promoCode.get', get, {})
 async function get () {
   let now = new Date()
 
+  filter = {
+    'validity.from': { $lte: now },
+    'validity.to': { $gte: now }
+  }
+
   try {
-    let codes = await PromoCode.find({ expire: { '$gt': now.toISOString() } }, {}, {})
+    let codes = await PromoCode.find(filter)
     if (!codes) {
       log.warn({ err: err }, 'could not find promo code')
       return cb(Boom.notFound())

server/routes/deck/handlers.js

@@ -190,3 +190,19 @@ exports.getSpeaker = {
         }
     }
 }
+
+exports.getCalendarUrl = {
+    options: {
+        tags: ['api', 'calendar'],
+        description: 'Get the calendar url for the current edition'
+    },
+    handler: async (request, h) => {
+        try {
+            const edition = await request.server.methods.deck.getLatestEdition()
+            return h.response(edition.calendarUrl)
+        } catch(err) {
+            log.error({ error: err })
+            throw Boom.boomify(err)
+        }
+    }
+}

server/routes/deck/index.js

@@ -62,4 +62,11 @@ server.route({
     path: '/speaker/{speakerId}',
     options: handlers.getSpeaker.options,
     handler: handlers.getSpeaker.handler
+})
+
+server.route({
+    method: 'GET',
+    path: '/calendar',
+    options: handlers.getCalendarUrl.options,
+    handler: handlers.getCalendarUrl.handler
 })

server/views/company.js

@@ -10,6 +10,7 @@ function renderObject (model) {
   return {
       id: model.id,
       name: model.name,
+      site: model.site,
       advertisementLvl: model.advertisementLvl,
       img: model.img
   }

server/views/event.js

@@ -16,7 +16,8 @@ module.exports = function render (content) {
         duration: model.duration,
         begin: model.begin,
         end: model.end,
-        isOcurring: model.isOcurring
+        isOcurring: model.isOcurring,
+        calendarUrl: model.calendarUrl,
     }
   }
 

server/views/promo-code.js

@@ -10,7 +10,7 @@ function renderObject (model) {
   return {
     company: model.company,
     edition: model.edition,
-    expire: model.expire,
+    expire: model.validity.to,
     description: model.description,
     code: model.code
   }