From b28ead5937a5048d7742de4db6579628a01faa45 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Mon, 22 Jul 2019 19:34:45 +0200
Subject: [PATCH] a

---
 modules/events/event.model.js   | 2 +-
 modules/events/event.service.js | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/events/event.model.js b/modules/events/event.model.js
index ffdae6d..3c70680 100644
--- a/modules/events/event.model.js
+++ b/modules/events/event.model.js
@@ -213,7 +213,7 @@ module.exports = function (sequelize, DataTypes) {
     Event.addScope('includeInscription', (userId) => {
         return {
             include: [
-                { model: sequelize.models.EventInscription, as: 'inscriptions', where: {userId: userId} }
+                { model: sequelize.models.EventInscription, as: 'inscriptions', required: false, where: {userId: userId} }
             ]
         }
     });
diff --git a/modules/events/event.service.js b/modules/events/event.service.js
index 9fdc91b..1c7c05b 100644
--- a/modules/events/event.service.js
+++ b/modules/events/event.service.js
@@ -74,7 +74,9 @@ const extraMethods = {
 
 
     afterFetchOne: (result, params, context) => {
-        return eventComposer(result.toJSON(), context);
+        if (result) 
+            result = result.toJSON();
+        return eventComposer(result, context);
     },