events route

core/controllers/index.js

@@ -26,7 +26,6 @@ const generateControllers = (service, extraControllers = {}, options = {}) => {
     const defaultControllers = {
         find: async (req, res, next) => {            
             const params = extractParamsFromRequest(req, res, _options.params.find);
-
             try {
                 const result = await service.fetchAll(params, buildContext(req, res));                
                 return handleResultResponse(result.rows, result.count, params, res);

core/passport.js

@@ -69,6 +69,7 @@ const localPhoneOptions = {
 
 passport.use('local-phone', new LocalStrategy(localPhoneOptions, async (phone, fbuid, done) => {
     try {
+console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><');
         //Comprobamos si el usuario ya existe en nuestro sistema
         const user = await authService.extraMethods.findUser({ phone, fbuid });
 

modules/auth/auth.controller.js

@@ -59,9 +59,7 @@ console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>regsitro');
             name: req.body.name,
             surname: req.body.surname,
             entityid: req.body.entityid,
-            entityname: req.body.entityname,
+            accessibility:  req.body.accessibility
-            profile_picture: req.body.profile_picture,
-            accessibility: req.body.accessibility,              
         };
         console.log(data);
         res.json({

modules/auth/auth.validations.js

@@ -10,11 +10,8 @@ const RegisterInputType = Joi.object().keys({
     email: Joi.string().required(),
     fbuid: Joi.string().required(), 
     name: Joi.string().required(),
-    surname: Joi.string(),           
+    surname: Joi.string(),
-    entityid: Joi.string(),
+    entityid: Joi.string()
-    entityname: Joi.string(),
-    profile_picture: Joi.string(),
-    accessibility: Joi.string(),
 });
 
 const LoginOutputType = Joi.object().keys({

modules/auth/user.model.js

@@ -33,10 +33,6 @@ module.exports = function (sequelize, DataTypes) {
         surname: {
             type: DataTypes.STRING,
         },
-        entityId: {
-            type: DataTypes.UUID,
-            foreignKey : true,
-        },
         profile_picture: {
             type: DataTypes.STRING,
             defaultValue: 'media/defaultProfile.png',

modules/events/event.controller.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const generateControllers = require('../../core/controllers');
+const eventService = require('./event.service');
+
+
+// Module Name
+const MODULE_NAME = '[event.controller]';
+
+const controllerOptions = { MODULE_NAME };
+const extraControllers = {};
+
+module.exports = generateControllers(eventService, extraControllers, controllerOptions);
+

modules/events/event.model.js

@@ -87,7 +87,9 @@ module.exports = function (sequelize, DataTypes) {
     });
 
     Event.associate = function (models) {
-        Event.OverflowEvent = Event.belongsTo(models.Event, { foreignKey: 'overflow_eventId' });
+        Event.OverflowEvent = Event.belongsTo(models.Event, { 
+            as: 'EventTo',
+            foreignKey: 'overflow_eventId' });
         Event.EventType = Event.belongsTo(models.EventType, { foreignKey: 'typeId' });
         Event.UserCreate = Event.belongsTo(models.User, { foreignKey: 'userId' });
         Event.Venue = Event.belongsTo(models.Venue, { foreignKey: 'venueId' });

modules/events/event.routes.js

@@ -0,0 +1,21 @@
+const routes = require('express').Router();
+
+const { isAdministratorUser, isLoggedUser } = require('../../middlewares/accessValidator');
+const SchemaValidator = require('../../middlewares/schemaValidator');
+
+/*const PaginateMiddleware = require('../../middlewares/paginate');
+const FieldMiddleware = require('../../middlewares/fields');*/
+//const SortMiddleware = require('../../middlewares/sort');
+
+//const entityValidation = require('./entity.validations');
+const eventController = require('./event.controller');
+
+routes.get('/events', eventController.find);
+//routes.get('/venues', isLoggedUser, SortMiddleware.middleware({ default: "name" }), venueController.find);
+//routes.get('/venues/:id', isLoggedUser, venueController.findOne);
+
+//routes.post('/entity/', SchemaValidator(VenueValidation.VenueInputType, true), venueController.create);
+//routes.put('/venues/:id', isAdministratorUser, venueController.update);
+//routes.delete('/venues/:id', isAdministratorUser, venueController.delete);
+
+module.exports = routes;

modules/events/event.service.js

@@ -0,0 +1,10 @@
+/* global Venue */
+'use strict';
+
+const _ = require('lodash');
+const { generateService, parseParamsToFindOptions } = require('../../helpers/service.helper');
+const models = require('../../core/models');
+
+const extraMethods = {};
+
+module.exports = generateService(models.Event, extraMethods);

modules/events/events_reservations.model.js

@@ -66,7 +66,9 @@ module.exports = function (sequelize, DataTypes) {
     });
 
     EventReservation.associate = function (models) {
-        EventReservation.OverflowEventReservation = EventReservation.belongsTo(models.EventReservation, { foreignKey: 'overflow_event_reservationId' });        
+        EventReservation.OverflowEventReservation = EventReservation.belongsTo(models.EventReservation, { 
+            as: 'EventToEvent',
+            foreignKey: 'overflow_event_reservationId' });        
         EventReservation.Entity = EventReservation.belongsTo(models.Entity, { foreignKey: 'entityId' });
         EventReservation.Event = EventReservation.belongsTo(models.Event, { foreignKey: 'eventId' });
         EventReservation.UserCreate = EventReservation.belongsTo(models.User, { foreignKey: 'userId' });