update deps, node >= 14, add mariadb and postgres to tests

server/api/controller/collection.js

@@ -14,8 +14,7 @@ const collectionController = {
     const withFilters = req.query.withFilters
     let collections
     if (withFilters) {
-      collections = await Collection.findAll({ include: [Filter] })
-
+      collections = await Collection.findAll({ include: [ Filter ] })
     } else {
       collections = await Collection.findAll()
     }
@@ -109,9 +108,14 @@ const collectionController = {
     }
 
     // TODO: validation
-    log.info('Create collection: ' + req.body.name)
-    const collection = await Collection.create(collectionDetail)
-    res.json(collection)
+    log.info(`Create collection: ${req.body.name}`)
+    try {
+      const collection = await Collection.create(collectionDetail)
+      res.json(collection)
+    } catch (e) {
+      log.error(`Create collection failed ${e}`)
+      res.sendStatus(400)
+    }
   },
 
   async remove (req, res) {
@@ -122,7 +126,7 @@ const collectionController = {
       await collection.destroy()
       res.sendStatus(200)
     } catch (e) {
-      log.error('Remove collection failed:', e)
+      log.error('Remove collection failed:' + String(e))
       res.sendStatus(404)
     }
   },
@@ -148,9 +152,12 @@ const collectionController = {
 
   async removeFilter (req, res) {
     const filter_id = req.params.id
-    log.info('Remove filter', filter_id)
+    log.info(`Remove filter ${filter_id}`)
     try {
       const filter = await Filter.findByPk(filter_id)
+      if (!filter) {
+        return res.sendStatus(404)
+      }
       await filter.destroy()
       res.sendStatus(200)
     } catch (e) {

server/api/controller/event.js

@@ -391,7 +391,13 @@ const eventController = {
       let place
       if (body.place_id) {
         place = await Place.findByPk(body.place_id)
+        if (!place) {
+          return res.status(400).send(`Place not found`)
+        }
       } else {
+        if (!body.place_name) {
+          return res.status(400).send(`Place not found`)
+        }
         place = await Place.findOne({ where: Sequelize.where(Sequelize.fn('LOWER', Sequelize.col('name')), Op.eq, body.place_name.trim().toLocaleLowerCase() )})
         if (!place) {
           if (!body.place_address || !body.place_name) {
@@ -639,11 +645,11 @@ const eventController = {
     if (tags && places) {
       where[Op.and] = [ 
         { placeId: places ? places.split(',') : []},
-        Sequelize.fn('EXISTS', Sequelize.literal(`SELECT 1 FROM event_tags WHERE ${Col('event_tags.eventId')}=event.id AND LOWER(${Col('tagTag')}) in (?)`))
+        Sequelize.fn('EXISTS', Sequelize.literal(`SELECT 1 FROM event_tags WHERE ${Col('event_tags.eventId')}=${Col('event.id')} AND LOWER(${Col('tagTag')}) in (?)`))
       ]
       replacements.push(tags)
     } else if (tags) {
-      where[Op.and] = Sequelize.fn('EXISTS', Sequelize.literal(`SELECT 1 FROM event_tags WHERE ${Col('event_tags.eventId')}=event.id AND LOWER(${Col('tagTag')}) in (?)`))
+      where[Op.and] = Sequelize.fn('EXISTS', Sequelize.literal(`SELECT 1 FROM event_tags WHERE ${Col('event_tags.eventId')}=${Col('event.id')} AND LOWER(${Col('tagTag')}) in (?)`))
       replacements.push(tags)
     } else if (places) {
       where.placeId = places.split(',')

server/api/models/collection.js

@@ -3,6 +3,7 @@ const sequelize = require('./index').sequelize
 
 class Collection extends Model {}
 
+// TODO: slugify!
 Collection.init({
   id: {
     type: DataTypes.INTEGER,

server/helpers.js

@@ -111,6 +111,8 @@ module.exports = {
   col (field) {
     if (config.db.dialect === 'postgres') {
       return '"' + field.split('.').join('"."') + '"'
+    } else if (config.db.dialect === 'mariadb') {
+      return '`' + field.split('.').join('`.`') + '`'
     } else {
       return field
     }

server/routes.js

@@ -1,90 +1,100 @@
 const express = require('express')
 const cookieParser = require('cookie-parser')
-
-const initialize = require('./initialize.server')
-initialize.start()
-
-// const metricsController = require('./metrics')
-// const promBundle = require('express-prom-bundle')
-// const metricsMiddleware = promBundle({ includeMethod: true })
-const config = require('./config')
-
-const helpers = require('./helpers')
-const log = require('./log')
-const api = require('./api')
-
-
 const app = express()
-app.enable('trust proxy')
-app.use(helpers.logRequest)
+const initialize = require('./initialize.server')
 
-app.use(helpers.initSettings)
-app.use(helpers.setUserLocale)
-app.use(helpers.serveStatic())
+async function main () {
 
-app.use(cookieParser())
+  await initialize.start()
+
+  // const metricsController = require('./metrics')
+  // const promBundle = require('express-prom-bundle')
+  // const metricsMiddleware = promBundle({ includeMethod: true })
+
+  const config = require('./config')
+
+  const helpers = require('./helpers')
+  const log = require('./log')
+  const api = require('./api')
+
+  app.enable('trust proxy')
+  app.use(helpers.logRequest)
+
+  app.use(helpers.initSettings)
+  app.use(helpers.setUserLocale)
+  app.use(helpers.serveStatic())
+
+  app.use(cookieParser())
 
 
-// do not handle all routes on setup
-if (config.status === 'READY') {
-  const cors = require('cors')
-  const { spamFilter } = require('./federation/helpers')
-  const oauth = require('./api/oauth')
-  const auth = require('./api/auth')
-  const federation = require('./federation')
-  const webfinger = require('./federation/webfinger')
-  const exportController = require('./api/controller/export')
-  const tagController = require('./api/controller/tag')
-  const placeController = require('./api/controller/place')
-  const collectionController = require('./api/controller/collection')
+  // do not handle all routes on setup
+  if (config.status === 'READY') {
+    const cors = require('cors')
+    const { spamFilter } = require('./federation/helpers')
+    const oauth = require('./api/oauth')
+    const auth = require('./api/auth')
+    const federation = require('./federation')
+    const webfinger = require('./federation/webfinger')
+    const exportController = require('./api/controller/export')
+    const tagController = require('./api/controller/tag')
+    const placeController = require('./api/controller/place')
+    const collectionController = require('./api/controller/collection')
 
-  // rss / ics feed
-  app.use(helpers.feedRedirect)
-  app.get('/feed/:format/tag/:tag', cors(), tagController.getEvents)
-  app.get('/feed/:format/place/:placeName', cors(), placeController.getEvents)
-  app.get('/feed/:format/collection/:name', cors(), collectionController.getEvents)
-  app.get('/feed/:format', cors(), exportController.export)
+    // rss / ics feed
+    app.use(helpers.feedRedirect)
+    app.get('/feed/:format/tag/:tag', cors(), tagController.getEvents)
+    app.get('/feed/:format/place/:placeName', cors(), placeController.getEvents)
+    app.get('/feed/:format/collection/:name', cors(), collectionController.getEvents)
+    app.get('/feed/:format', cors(), exportController.export)
 
-  
-  app.use('/event/:slug', helpers.APRedirect)
-  
-  // federation api / activitypub / webfinger / nodeinfo
-  app.use('/federation', federation)
-  app.use('/.well-known', webfinger)
+    
+    app.use('/event/:slug', helpers.APRedirect)
+    
+    // federation api / activitypub / webfinger / nodeinfo
+    app.use('/federation', federation)
+    app.use('/.well-known', webfinger)
 
-  // ignore unimplemented ping url from fediverse
-  app.use(spamFilter)
+    // ignore unimplemented ping url from fediverse
+    app.use(spamFilter)
 
-  // fill res.locals.user if request is authenticated
-  app.use(auth.fillUser)
+    // fill res.locals.user if request is authenticated
+    app.use(auth.fillUser)
 
-  app.use('/oauth', oauth)
-  // app.use(metricsMiddleware)
+    app.use('/oauth', oauth)
+    // app.use(metricsMiddleware)
+  }
+
+  // api!
+  app.use('/api', api)
+
+  // // Handle 500
+  app.use((error, _req, res, _next) => {
+    log.error('[ERROR]' + error)
+    return res.status(500).send('500: Internal Server Error')
+  })
+
+  // remaining request goes to nuxt
+  // first nuxt component is ./pages/index.vue (with ./layouts/default.vue)
+  // prefill current events, tags, places and announcements (used in every path)
+  app.use(async (_req, res, next) => {
+    if (config.status === 'READY') {
+
+      const announceController = require('./api/controller/announce')
+      res.locals.announcements = await announceController._getVisible()
+    }
+    res.locals.status = config.status
+    next()
+  })
+
+  return app
 }
 
-// api!
-app.use('/api', api)
-
-// // Handle 500
-app.use((error, _req, res, _next) => {
-  log.error('[ERROR]' + error)
-  return res.status(500).send('500: Internal Server Error')
-})
-
-// remaining request goes to nuxt
-// first nuxt component is ./pages/index.vue (with ./layouts/default.vue)
-// prefill current events, tags, places and announcements (used in every path)
-app.use(async (_req, res, next) => {
-  if (config.status === 'READY') {
-
-    const announceController = require('./api/controller/announce')    
-    res.locals.announcements = await announceController._getVisible()
-  }
-  res.locals.status = config.status
-  next()
-})
+if (process.env.NODE_ENV !== 'test') {
+  main()
+}
 
 module.exports = {
+  main,
   handler: app,
   unload: () => initialize.shutdown(false)
 }