1.3.3

modules/events/event.controller.js

@@ -147,7 +147,7 @@ const extraControllers = {
     const userId = req.user.id;
     var result = null;
 
-    //console.log(params, req.user.level);
+    //console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', params, req.user.level);
     if (!eventId)
       return handleResultResponse("Es necesario el ID del evento", null, params, res, httpStatus.NOT_FOUND);
 
@@ -282,7 +282,7 @@ const extraControllers = {
             var member = generateMemberInscription(inscription.user, inscription, inscription.reservation);
             member.marketing_memberId = await eventInscriptionService._addMember(marketingListIdEvent, member);
             eventInscriptionService._updateMarketingMemberOfInscription(inscription.id, member.marketing_memberId);
-            member.qrConfig = generateQRConfig(member);
+            member.qrConfig = QRHelper.generateQRConfig(member);
             member.qrCode = await QRHelper.getInscriptionQRCode(member.qrConfig);
             member.qrCodeUrl = QRHelper.getInscriptionQRCodeUrl(inscription.id);
             console.log(

modules/events/events_inscriptions.controller.js

@@ -8,9 +8,10 @@ const eventService = require("./event.service");
 const mailService = require("./mail.service");
 const marketingListService = require("./marketing_list.service");
 const QRHelper = require("../../helpers/qr.helper");
-const { extractParamsFromRequest, handleResultResponse } = require("../../helpers/controller.helper");
+const { extractParamsFromRequest, handleResultResponse, handleErrorResponse } = require("../../helpers/controller.helper");
 const { data } = require("../../core/logger");
 const lodash = require("lodash");
+const userService = require("../auth/user.service");
 
 // Module Name
 const MODULE_NAME = "[eventInscription.controller]";
@@ -20,13 +21,7 @@ const controllerOptions = { MODULE_NAME };
 async function refreshConfirmed(inscription) {
 
   if (!inscription) {
-    return handleResultResponse(
-                "Error al eliminar inscripción, no puedo cambiar confirmados a la reserva asociada",
-                null,
-                params,
-                res,
-                httpStatus.NOT_FOUND
-              );
+    throw new Error("Error al eliminar inscripción, no puedo cambiar confirmados a la reserva asociada");
   };
 
   if (inscription.type === "online")
@@ -74,25 +69,15 @@ async function refreshConfirmed (inscription){
   if (inscription.reservationId != null) {
     console.log(">>>>>>>>>>>>>>Voy a actualizar aforo reserva", EventOrReservationChangeId);
     console.log(">>>>>>>>>>>>>> ", NewConfirmed);
-            if (!(await eventReservationService._updateConfirmedReservation(EventOrReservationChangeId, NewConfirmed)))
-              return handleResultResponse(
-                "Error al eliminar inscripción, no puedo cambiar confirmados a la reserva asociada",
-                null,
-                params,
-                res,
-                httpStatus.NOT_FOUND
-              );
+    if (!(await eventReservationService._updateConfirmedReservation(EventOrReservationChangeId, NewConfirmed))) {
+      throw new Error("Error al eliminar inscripción, no puedo cambiar confirmados a la reserva asociada");
+    }
   } else {
     console.log(">>>>>>>>>>>>>>Voy a actualizar aforo evento", EventOrReservationChangeId);
     console.log(">>>>>>>>>>>>>> ", NewConfirmed);
-            if (!(await eventService._updateConfirmedEvent(EventOrReservationChangeId, NewConfirmed)))
-              return handleResultResponse(
-                "Error al eliminar inscripción, no puedo cambiar confirmados a la inscripcion",
-                null,
-                params,
-                res,
-                httpStatus.NOT_FOUND
-              );
+    if (!(await eventService._updateConfirmedEvent(EventOrReservationChangeId, NewConfirmed))) {
+      throw new Error("Error al eliminar inscripción, no puedo cambiar confirmados a la inscripcion");
+    }
   };
 }
 

modules/events/events_inscriptions.service.js

@@ -59,14 +59,6 @@ const extraMethods = {
     });
   },
 
-  _getInscriptionByEvent: (eventId) => {
-    return models.EventInscription.scope("defaultScope").findAll({
-      where: {
-        eventId: eventId,
-      },
-    });
-  },  
-
   _getInscriptionByEventAndValidated: (eventId, validated) => {
     return models.EventInscription.scope("defaultScope").findAll({
       where: {

modules/events/events_reservations.controller.js

@@ -237,7 +237,8 @@ const extraControllers = {
           params,
           res,
           httpStatus.NOT_FOUND
-      )};
+        )
+      };
 
       const reservationData = {
         reservation_code: eventReservationService._generateReservatioCode(dataInscription.event, dataUser.entityName),
@@ -332,7 +333,7 @@ const extraControllers = {
         );
 
       //Si se ha llenado ponemos el evento en SOLD_OUT
-      if (eventToDiscountAssistants.confirmed == newAforo)
+      if (eventToDiscountAssistants.confirmed >= newAforo)
         await eventService._updateSoldOutEvent(eventToDiscountAssistants.id, true);
 
       //Finalmente publicamos la reserva solo si no está asociada a la lista de espera

modules/speakers/speaker.model.js

@@ -125,7 +125,8 @@ module.exports = function (sequelize, DataTypes) {
                 required: false,
                 include: [{
                     model: sequelize.models.MultimediaFile,
-                    as: "multimediaFile"
+                    as: "multimediaFile",
+                    order: [['createdAt', 'DESC']],                        
                 }]
             },
             ]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lqdvi-api3",
-  "version": "1.3.0",
+  "version": "1.3.3",
   "description": "",
   "author": "Rodax Software",
   "license": "ISC",