Merge pull request #95 from ProyectoIntegrador2018/dev

HU009, HU010, HU018

Author: jorgeiiavila

back/package-lock.json

@@ -24,9 +24,11 @@
     "express-jwt": "^5.3.3",
     "handlebars": "^4.7.6",
     "jsonwebtoken": "^8.5.1",
+    "moment-timezone": "^0.5.31",
     "mongoose": "^5.9.6",
     "mongoose-beautiful-unique-validation": "^7.1.1",
     "multer": "^1.4.2",
+    "node-cron": "^2.0.3",
     "nodemailer": "^6.4.6",
     "pretty-error": "^2.1.1"
   },

back/package.json

@@ -0,0 +1,38 @@
+import * as EventLogic from "@/logics/event.logic";
+import { send } from "@/utils/errors";
+
+export const searchEvent = (request, response) => {
+  send(response, async () => {
+    const query = request.query;
+    return await EventLogic.searchEvent(query);
+  });
+};
+
+export const getEventById = (request, response) => {
+  send(response, async () => {
+    const id = request.params.id;
+    return await EventLogic.getEventById(id);
+  });
+};
+
+export const createEvent = (request, response) => {
+  send(response, async () => {
+    const event = request.body;
+    return await EventLogic.createEvent(event);
+  });
+};
+
+export const updateEvent = (request, response) => {
+  send(response, async () => {
+    const event = request.body;
+    const id = request.params.id;
+    return await EventLogic.updateEvent(id, event);
+  });
+};
+
+export const deleteEvent = (request, response) => {
+  send(response, async () => {
+    const id = request.params.id;
+    return await EventLogic.deleteEvent(id);
+  });
+};

back/src/controllers/event.controller.js

@@ -0,0 +1,38 @@
+import * as PointOfSaleLogic from "@/logics/pointOfSale.logic";
+import { send } from "@/utils/errors";
+
+export const searchPoS = (request, response) => {
+  send(response, async () => {
+    const query = request.query;
+    return await PointOfSaleLogic.searchPoS(query);
+  });
+};
+
+export const getPoSById = (request, response) => {
+  send(response, async () => {
+    const id = request.params.id;
+    return await PointOfSaleLogic.getPoSById(id);
+  });
+};
+
+export const createPoS = (request, response) => {
+  send(response, async () => {
+    const poS = request.body;
+    return await PointOfSaleLogic.createPoS(poS);
+  });
+};
+
+export const updatePoS = (request, response) => {
+  send(response, async () => {
+    const poS = request.body;
+    const id = request.params.id;
+    return await PointOfSaleLogic.updatePoS(id, poS);
+  });
+};
+
+export const deletePoS = (request, response) => {
+  send(response, async () => {
+    const id = request.params.id;
+    return await PointOfSaleLogic.deletePoS(id);
+  });
+};

back/src/controllers/pointOfSale.controller.js

@@ -3,6 +3,7 @@ import { SuggestionModel } from "@/models/suggestion.model";
 import { TextModel } from "@/models/text.model";
 import { sendEmail } from "@/utils/mailSender";
 import { send } from "@/utils/errors";
+import { UserModel } from "@/models/user.model";
 
 //Asigna X cantindad de lectores a un libro
 export const assignReaders = async (text, amount) => {
@@ -192,14 +193,20 @@ export const calculateBetweenDatesPoints = async (initialDate, finalDate) => {
 };
 
 //Funcion que modifica el status de la sugerencia de un lector a un libro
-export const changeSuggestionStatus = async (id, newStatus, previousStatus) => {
+export const changeSuggestionStatus = async (
+  id,
+  newStatus,
+  previousStatus,
+  session
+) => {
   const suggestion = await SuggestionModel.findById(id).populate("text");
   if (!suggestion) throw { error: `Suggestion with id: ${id} not found` };
   if (suggestion.suggestionStatus === previousStatus) {
     suggestion.suggestionStatus = newStatus;
     await SuggestionModel.updateOne(
       { _id: suggestion._id },
-      { suggestionStatus: newStatus, ...suggestion._doc }
+      { suggestionStatus: newStatus, ...suggestion._doc },
+      { session }
     );
     return suggestion;
   } else {
@@ -211,26 +218,58 @@ export const changeSuggestionStatus = async (id, newStatus, previousStatus) => {
 
 //Funcion que rechaza la sugerencia a un libro por parte de un lector
 export const rejectSuggestion = (request, response) => {
-  send(response, async () => {
+  send(response, async (session) => {
     const { id } = request.params;
-    var suggestion = await SuggestionModel.findById(id);
-    var text = await TextModel.findById(suggestion.text);
+    const suggestion = await SuggestionModel.findById(id);
+    const textPromise = TextModel.findById(suggestion.text);
+    const readerPromise = ReaderModel.findById(suggestion.reader);
+    const [text, reader] = await Promise.all([textPromise, readerPromise]);
+    const user = await UserModel.findById(reader.user);
     await assignReaders(text, 1);
     const newSuggestion = await changeSuggestionStatus(
       id,
       "Rejected",
-      "Pending"
+      "Pending",
+      session
     );
+    // Update reader rejects in a row
+    reader.rejectsInARow++;
+    await reader.save({ session });
+
+    // If reader has rejected over five suggestions, send mail
+    if (reader.rejectsInARow > 5) {
+      const emailData = {
+        email: user.email,
+        subject: "Rechazo de lecturas"
+      };
+      await sendEmail(emailData, "reading_rejects", { readerName: user.name });
+      console.log(`EMAIL SENT TO USER ${user.name}`);
+    }
+
     return newSuggestion;
   });
 };
 
 //Funcion que acepta la sugerencia a un libro por parte de un lector
 export const acceptSuggestion = (request, response) => {
-  send(response, async () => {
+  send(response, async (session) => {
     const { id } = request.params;
-    const suggestion = await changeSuggestionStatus(id, "Accepted", "Pending");
-    return suggestion;
+    const suggestion = await SuggestionModel.findById(id);
+    const newSuggestionPromise = changeSuggestionStatus(
+      id,
+      "Accepted",
+      "Pending",
+      session
+    );
+    const readerPromise = ReaderModel.findById(suggestion.reader);
+    const [newSuggestion, reader] = await Promise.all([
+      newSuggestionPromise,
+      readerPromise
+    ]);
+    // Set rejects in a row to 0
+    reader.rejectsInARow = 0;
+    await reader.save();
+    return newSuggestion;
   });
 };
 
@@ -241,7 +280,8 @@ export const completeSuggestion = (request, response) => {
     const suggestion = await changeSuggestionStatus(
       id,
       "Completed",
-      "Accepted"
+      "Accepted",
+      session
     );
     return suggestion;
   });
@@ -366,7 +406,7 @@ export const getReadersWithoutSuggestion = (request, response) => {
     occupiedReaders.forEach((element) => {
       idOccupied.push(element.reader.toString());
     });
-    var finalArr = readers.filter(function(item) {
+    var finalArr = readers.filter(function (item) {
       return idOccupied.indexOf(item._id.toString()) === -1;
     });
     return finalArr;
@@ -377,9 +417,7 @@ export const getReadersWithoutSuggestion = (request, response) => {
 export const deleteSuggestionAdmin = (request, response) => {
   send(response, async () => {
     const { id } = request.params;
-    SuggestionModel.findOne({ _id: id })
-      .deleteOne()
-      .exec();
+    SuggestionModel.findOne({ _id: id }).deleteOne().exec();
   });
 };
 

back/src/controllers/suggestion.controller.js

@@ -18,7 +18,7 @@ export const getAllTexts = (request, response) => {
 export const getText = (request, response) => {
   send(response, async () => {
     const { id } = request.params;
-    const reader = await TextModel.findById(id).populate("genres");
+    const reader = await TextModel.find({_id:id}).populate("genres");
     return reader;
   });
 };

back/src/controllers/text.controller.js

@@ -50,7 +50,20 @@ export const getUser = (request, response) => {
 export const getUsers = (req, res) => {
   send(res, async () => {
     const users = await UserModel.find();
-    return users;
+    const readerUsersPromises = users
+      .filter((user) => user.roles.some((x) => x === "reader"))
+      .map(async (userReader) => {
+        const userReaderJSON = userReader.toJSON();
+        const reader = await ReaderModel.findOne({ user: userReader._id });
+        return {
+          ...userReaderJSON,
+          reader
+        };
+      });
+    const readerUsers = await Promise.all(readerUsersPromises);
+    return users
+      .filter((user) => !user.roles.some((x) => x === "reader"))
+      .concat(readerUsers);
   });
 };
 
@@ -78,7 +91,16 @@ export const createUser = async (request, response, role) => {
 // Response with all the genres.
 export const getAllGenres = (request, response) => {
   send(response, async () => {
-    const genres = await GenreModel.find();
+    const genres = await GenreModel.aggregate([
+      {
+         $lookup: {
+           from: "subgenres",
+           localField: "_id",
+           foreignField: "genre",
+           as: 'children'
+         }
+      }
+    ]);
     return genres;
   });
 };

back/src/controllers/user.controller.js

@@ -0,0 +1,16 @@
+<div>
+    <div>Hola, {{ readerName }}</div>
+    <br>
+    <div>
+    Esperamos que estés teniendo un buen día. Hemos notado que has rechazado las anteriores cinco peticiones 
+    para ser lector beta de nuestras obras. Entendemos que la semana puede ser muy pesada entre la escuela o el 
+    trabajo (¡o los dos!), así que queríamos saber si deseas permanecer en nuestra lista de lectores y seguir 
+    recibiendo nuestros correos. Si es así, ¡excelente! Ojalá las estrellas se alineen pronto para que puedas 
+    participar con nosotros. Si no, te agradecemos la confianza en darnos tus datos en primer lugar y que hallamos 
+    coincidido en nuestro amor por las letras.
+    </div>
+    <br>
+    <div>¿Puedes responder a este correo con tu respuesta? Así las hadas sabrán qué hacer a continuación.</div>
+    <br>
+    <div>¡Ten un buen día!</div>
+</div>

back/src/email-templates/reading_rejects.hbs

@@ -0,0 +1,12 @@
+<div>
+    <div>Hola, {{ readerName }}.</div>
+    <br>
+    <div>
+    Un gusto saludarte. Mandamos este mensaje para recordarte que quedan cinco días para que 
+    entregues tu opinión sobre la lectura de {{ book }}.
+    </div>
+    <br>
+    <div>¡Esperamos que estés disfrutando tu lectura y gracias de nuevo por tu ayuda!</div>
+    <br>
+    <div>Equipo Silma</div>
+</div>