From f1ba77c8484e5f34d9188e07e081d62c80963b45 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Tue, 9 Jul 2019 22:20:59 +0200
Subject: [PATCH] .

---
 helpers/service.helper.js          |  7 +++++--
 modules/speakers/speaker.routes.js | 25 +++++++++++++------------
 modules/values/value.routes.js     | 14 +++++++++++---
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/helpers/service.helper.js b/helpers/service.helper.js
index 4a552a7..0e05405 100644
--- a/helpers/service.helper.js
+++ b/helpers/service.helper.js
@@ -125,19 +125,22 @@ const generateService = (model, extraMethods = {}, options = defaultOptions) =>
     const defaultService = {
         fetchAssociation: async(params, context) => {
             const associationName = hasAssociation(params);
+            console.log('associationName => ', associationName);
             delete params.params.association;
 
             const associationInfo = foundModelAssociation(model, associationName);
             if (associationInfo) {
                 const master = await defaultService.fetchOne(params, context);
-                console.log(master);
                 const details = {
                     rows: await master[associationInfo.getFunc](),
                     count: await master[associationInfo.countFunc]()
                 }
                 return details;
             } else {
-                throw new Error('¡fetchAssociation error!');
+                return {
+                    rows: ["Association not exists"],
+                    count: 0
+                };
             }
         },
 
diff --git a/modules/speakers/speaker.routes.js b/modules/speakers/speaker.routes.js
index 1d98bbe..be137f0 100644
--- a/modules/speakers/speaker.routes.js
+++ b/modules/speakers/speaker.routes.js
@@ -52,18 +52,6 @@ routes.get('/speakers/:id',
     speakerController.findOne
 );
 
-// Listar las preguntas hechas a un ponente
-routes.get('/speakers/:id/questions',
-    //isLoggedUser, 
-    /*FieldMiddleware.middleware({
-        invalidFields: ['createdAt']
-    }),*/
-    PaginateMiddleware.middleware(),
-    SortMiddleware.middleware({ default: "-createdAt" }),
-    speakerController.find
-);
-
-
 // Dar ponentes similares a uno dado
 routes.get('/speakers/:id/similar',
     //isLoggedUser, 
@@ -75,6 +63,19 @@ routes.get('/speakers/:id/similar',
     speakerController.find
 );
 
+// Listar las preguntas hechas a un ponente
+routes.get('/speakers/:id/:association',
+    //isLoggedUser, 
+    /*FieldMiddleware.middleware({
+        invalidFields: ['createdAt']
+    }),*/
+    PaginateMiddleware.middleware(),
+    SortMiddleware.middleware({ default: "-createdAt" }),
+    speakerController.find
+);
+
+
+
 
 
 module.exports = routes;
\ No newline at end of file
diff --git a/modules/values/value.routes.js b/modules/values/value.routes.js
index 1dd5d2b..be3e0ee 100644
--- a/modules/values/value.routes.js
+++ b/modules/values/value.routes.js
@@ -28,15 +28,23 @@ routes.get('/values/:id',
     valueController.findOne
 );
 
-routes.get('/values/:id/:association',
+routes.get('/values/:id/speakers',
+    (req, res, next) => {
+        req.params.association = 'speakers';
+        next();
+    },
+    valueController.find,
+);
+
+//routes.get('/values/:id/:association',
     //isLoggedUser, 
     /*FieldMiddleware.middleware({
         invalidFields: ['createdAt']
     }),*/
     //PaginateMiddleware.middleware(),
     //SortMiddleware.middleware({ default: "name" }),
-    valueController.find,
-);
+    //valueController.find,
+//);
 
 
 module.exports = routes;
\ No newline at end of file