From 83f0cc3e9a365af481ab4eb54176780b89f03bc9 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Tue, 29 Oct 2019 17:32:27 +0100
Subject: [PATCH] a

---
 helpers/composes.helper.js        |  3 ---
 modules/entities/entity.routes.js | 29 ++++++++++++++---------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/helpers/composes.helper.js b/helpers/composes.helper.js
index 95c1bbb..9beb82f 100644
--- a/helpers/composes.helper.js
+++ b/helpers/composes.helper.js
@@ -249,9 +249,6 @@ const eventComposer = (event, context) => {
 
 const entityComposer = (entity, context) => {
 
-    delete entity.contact_person;
-    delete entity.contact_email;
-
     return Object.assign({},
         entity,
     )
diff --git a/modules/entities/entity.routes.js b/modules/entities/entity.routes.js
index bc1da52..9ecb3e9 100644
--- a/modules/entities/entity.routes.js
+++ b/modules/entities/entity.routes.js
@@ -14,24 +14,10 @@ const entityTypeController = require('./entity_type.controller');
 
 
 const generalInvalidFields = [
-    'state',, 'createdAt', 'updatedAt'
+    'state', 'contact_person', 'contact_email', 'createdAt', 'updatedAt'
 ];
 
 
-routes.get('/entities',
-    isLoggedUser,
-    cacheSuccesses('24 hours'),
-    FieldMiddleware.middleware({
-        invalidFields: generalInvalidFields
-    }),
-//    PaginateMiddleware.middleware(),
-    SortMiddleware.middleware({ default: "name" }),
-    entityController.find({
-        scopes: ['defaultScope'],
-    }),
-);
-
-
 routes.get ('/entities/colleges',
     //cacheSuccesses('24 hours'),
 //    PaginateMiddleware.middleware(),
@@ -61,6 +47,19 @@ routes.get ('/entities/partners',
  *  ADMINISTRACIÓN
  *********************************************************************************************************
  */
+routes.get('/admin/entities',
+    isAdministratorUser,
+    cacheSuccesses('24 hours'),
+//    FieldMiddleware.middleware({
+//        invalidFields: generalInvalidFields
+//    }),
+    //    PaginateMiddleware.middleware(),
+    SortMiddleware.middleware({ default: "name" }),
+    entityController.find(),
+);
+
+
+
 routes.get('/admin/entities/partners/:id', 
     //isAdministratorUser,
     entityController.findOne(),