From 4785c9f60ded06a326112c9397011d62bdc35c6b Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Thu, 5 May 2022 11:11:40 +0200
Subject: [PATCH] return tags and place on event creation

---
 server/api/controller/event.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/api/controller/event.js b/server/api/controller/event.js
index 743455c7..4e0dd2f6 100644
--- a/server/api/controller/event.js
+++ b/server/api/controller/event.js
@@ -327,7 +327,7 @@ const eventController = {
       }
 
       if (req.file || body.image_url) {
-        if (body.image_url) {
+        if (!req.file && body.image_url) {
           req.file = await helpers.getImageFromURL(body.image_url)
         }
 
@@ -345,7 +345,7 @@ const eventController = {
         eventDetails.media = []
       }
 
-      const event = await Event.create(eventDetails)
+      let event = await Event.create(eventDetails)
 
       const [place] = await Place.findOrCreate({
         where: { name: body.place_name },
@@ -355,14 +355,13 @@ const eventController = {
       })
 
       await event.setPlace(place)
-      event.place = place
 
       // create/assign tags
       if (body.tags) {
+        body.tags = body.tags.map(t => t.trim())
         await Tag.bulkCreate(body.tags.map(t => ({ tag: t })), { ignoreDuplicates: true })
         const tags = await Tag.findAll({ where: { tag: { [Op.in]: body.tags } } })
         await event.addTags(tags)
-        event.tags = tags
       }
 
       // associate user to event and reverse
@@ -371,6 +370,9 @@ const eventController = {
         await event.setUser(res.locals.user)
       }
 
+      event = event.get()
+      event.tags = body.tags
+      event.place = place
       // return created event to the client
       res.json(event)