update sequelize .spread usage

server/api/controller/event.js

@@ -275,12 +275,10 @@ const eventController = {
 
       const event = await Event.create(eventDetails)
 
-      // TOFIX: check if place is specified
-      // create place if needed
-      const place = await Place.findOrCreate({
+      const [place] = await Place.findOrCreate({
         where: { name: body.place_name },
         defaults: { address: body.place_address }
-      }).spread((place, created) => place)
+      })
 
       await event.setPlace(place)
       event.place = place
@@ -356,15 +354,11 @@ const eventController = {
     }
 
     await event.update(eventDetails)
-    let place
-    try {
-      place = await Place.findOrCreate({
-        where: { name: body.place_name },
-        defaults: { address: body.place_address }
-      }).spread((place, created) => place)
-    } catch (e) {
-      debug(e)
-    }
+    const [place] = await Place.findOrCreate({
+      where: { name: body.place_name },
+      defaults: { address: body.place_address }
+    })
+
     await event.setPlace(place)
     await event.setTags([])
     if (body.tags) {

server/api/controller/settings.js

@@ -84,12 +84,13 @@ const settingsController = {
 
   async set (key, value, is_secret = false) {
     try {
-      await Setting.findOrCreate({
+      const [setting, created] = await Setting.findOrCreate({
         where: { key },
         defaults: { value, is_secret }
-      }).spread((setting, created) => {
-        if (!created) { return setting.update({ value, is_secret }) }
       })
+
+      if (!created) { return setting.update({ value, is_secret }) }
+
       settingsController[is_secret ? 'secretSettings' : 'settings'][key] = value
       return true
     } catch (e) {