a

modules/events/event.controller.js

@@ -15,7 +15,7 @@ const MODULE_NAME = '[event.controller]';
 
 const controllerOptions = { MODULE_NAME };
 const extraControllers = {
-
+/*
     findNext: (config) => {
         config = config || {
             scopes: [],
@@ -68,7 +68,7 @@ const extraControllers = {
             handleErrorResponse(MODULE_NAME, 'findNext', error, res);
         }
     },
-
+*/
     createInscription: async(req, res, next) => {
         const params = extractParamsFromRequest(req, res, {});
         console.log('crear inscripcionnnnnnnnnnnnnnnnnnnnnnnnnnnn');
@@ -77,7 +77,7 @@ const extraControllers = {
     },
 
 
-    findOne2: async (req, res, next) => {
+    findOne: async (req, res, next) => {
         const params = extractParamsFromRequest(req, res, { includeAll: false });
 
         try {

modules/events/event.model.js

@@ -160,6 +160,7 @@ module.exports = function (sequelize, DataTypes) {
                 where: { 
                     type: 'speaker'
                 },
+                required: false,
                 include: [{ 
                     model: sequelize.models.Speaker, 
                     as: 'speaker',

modules/events/event.routes.js

@@ -18,13 +18,15 @@ const generalInvalidFields = [
 ];
 
 routes.get('/events', 
-    isLoggedUser,
+    //isLoggedUser,
     FieldMiddleware.middleware({
         invalidFields: generalInvalidFields
     }),    
     PaginateMiddleware.middleware(),
-    SortMiddleware.middleware({ default: "-date" }), 
-    eventController.find
+    SortMiddleware.middleware({ default: "-init_date" }), 
+    eventController.find({
+        scopes: ['defaultScope', 'includeVenue'],
+    }),
 );
 
 routes.get('/events/next',
@@ -37,14 +39,10 @@ routes.get('/events/next',
     eventController.find({
         scopes: ['defaultScope', 'next', 'includeVenue', 'includeSpeakers'],
     }),
-//eventController.find    ,  'includeSpeakers'
-//    model.scope('next').findAll();
-    ///SchemaValidator(eventValidation.EventsListOutputType, true), 
-
 );
 
 routes.get('/events/past', 
-    isLoggedUser,
+    //isLoggedUser,
     FieldMiddleware.middleware({
         invalidFields: generalInvalidFields
     }),    
@@ -53,17 +51,15 @@ routes.get('/events/past',
     eventController.find({
         scopes: ['defaultScope', 'past', 'includeVenue', 'includeSpeakers'],
     }),
-
-//    eventController.findPass
 );
 
 routes.get('/events/current', 
-    isLoggedUser,
+    //isLoggedUser,
     FieldMiddleware.middleware({
         invalidFields: generalInvalidFields
     }),    
     PaginateMiddleware.middleware(),
-    SortMiddleware.middleware({ default: "init_available_date" }), 
+    SortMiddleware.middleware({ default: "-init_date" }), 
     eventController.find({
         scopes: ['defaultScope', 'current', 'includeVenue', 'includeSpeakers'],
     }),

modules/events/event.service.js

@@ -9,6 +9,8 @@ const models = require('../../core/models');
 
 const extraMethods = {
     afterFetchAll: (result, params, context) => {
+    return result;
+/*    
         if (!result.count) {
             return result;
         }
@@ -27,6 +29,7 @@ const extraMethods = {
             count: rows.length,
             rows: rows
         }
+*/        
     },