From 20320e678233361fec9b5d7b8ecac4dc93016552 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Sun, 5 Jul 2020 23:50:10 +0200
Subject: [PATCH] update sequelize .spread usage

---
 server/api/controller/event.js    | 20 +++++++-------------
 server/api/controller/settings.js |  7 ++++---
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/server/api/controller/event.js b/server/api/controller/event.js
index 226ec6da..bead4162 100644
--- a/server/api/controller/event.js
+++ b/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) {
diff --git a/server/api/controller/settings.js b/server/api/controller/settings.js
index 4738f638..f837aab7 100644
--- a/server/api/controller/settings.js
+++ b/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) {