Merge branch 'dist'

Author: AlexanderDmitriev

controllers/stat/addDailyStats.js

@@ -4,64 +4,72 @@ const { Stat } = require("../../models/stat");
 const { RequestError } = require("../../helpers");
 
 const addStatistics = async (req, res) => {
-    const { _id: userId } = req.user;
-    const newDailyStats = req.body;
-
-    const oldStatistic = await Stat.findOne({owner: userId, status: "in progress"});
-    const booksId = oldStatistic.training.active;
-    const activeBooks = [];
-
-    await booksId.forEach(async (item) => {
-              const book = await Book.findById(item);
-              activeBooks.push(book);
-              console.log(book);
-              console.log("search done");
-            });
-    
-    const totalPagesReaded = oldStatistic.statistic.reduce((acc, {pages}) => {
-        if(!pages) {
-            return acc;
-        }
-        console.log("total pages")
-        return acc + parseInt(pages);
-    },0) + parseInt(newDailyStats.pages);
-
-    console.log(totalPagesReaded)
-
-    
-    const planningPages = 0;
-
-    for(let i = 0; i < activeBooks.length; i += 1) {
-        
-        if((+activeBooks[i] + planningPages) > totalPagesReaded) {
-            break;
-        };
-
-        if (activeBooks[i].status === "in progress") {
-            activeBooks[i].status = "finished";
-            await Book.findByIdAndUpdate(activeBooks[i]._id, { status: "finished"});
-        };
-    };
-
-    const finishedBooks = activeBooks.filter(book => book.status === "finished");
-
-    console.log(finishedBooks)
-    console.log(activeBooks)
-
-    const isTrainingFinished = activeBooks.length === finishedBooks.length;
-
-    oldStatistic.statistic.push(newDailyStats);
-
-    const result = await Stat.findOneAndUpdate({_id: oldStatistic._id},{statistic: oldStatistic.statistic}, {new: true})
-
-    if (isTrainingFinished) {
-        result.message = "Training succesffuly end";
-        await Stat.findOneAndUpdate({_id: oldStatistic._id},{status: "done"});
-        console.log("finish ???")
+  const { _id: userId } = req.user;
+  const newDailyStats = req.body;
+
+  const oldStatistic = await Stat.findOne({
+    owner: userId,
+    status: "in progress",
+  });
+
+  if(!oldStatistic) {
+    throw RequestError(400, "Not found active training");
+  }
+  const booksId = oldStatistic.training.active;
+  const allBooks = await Book.find({ owner: userId }, " -createdAt -updatedAt");
+  const activeBooks = allBooks.filter((book) => booksId.includes(book._id));
+  const totalPagesReaded =
+    oldStatistic.statistic.reduce((acc, { pages }) => {
+      if (!pages) {
+        return acc;
+      }
+      return acc + parseInt(pages);
+    }, 0) + parseInt(newDailyStats.pages);
+
+  let activePagesCount = 0;
+
+  await (async function () {
+    for (let i = 0; i < activeBooks.length; i += 1) {
+      activePagesCount += parseInt(activeBooks[i].pages);
+      console.log(activePagesCount);
+
+      if (activePagesCount > totalPagesReaded) {
+        break;
+      }
+
+      if (activeBooks[i].status === "in progress") {
+        activeBooks[i].status = "finished";
+        await Book.findByIdAndUpdate(activeBooks[i]._id, {
+          status: "finished",
+        });
+      }
     }
-
-    res.status(201).json(result);
+  })();
+
+  const finishedBooks = activeBooks.filter(
+    (book) => book.status === "finished"
+  );
+
+  const isTrainingDone = activeBooks.length === finishedBooks.length;
+  oldStatistic.statistic.push(newDailyStats);
+
+  let result = {};
+
+  if (isTrainingDone) {
+    result = await Stat.findOneAndUpdate(
+      { _id: oldStatistic._id },
+      { statistic: oldStatistic.statistic, status: "done" },
+      { new: true }
+    );
+  } else {
+    result = await Stat.findOneAndUpdate(
+      { _id: oldStatistic._id },
+      { statistic: oldStatistic.statistic },
+      { new: true }
+    );
+  }
+
+  res.status(201).json(result);
 };
 
 module.exports = addStatistics;
-

controllers/stat/getStatistics.js

@@ -5,10 +5,9 @@ const getStatistics = async (req, res) => {
     const { _id } = req.user;
 
     const result = await Stat.findOne({owner: _id, status: "in progress"})
-
-    if (!result) {
-        throw RequestError(500, "Something went wrong");
-    }
+    if(!result) {
+        throw RequestError(400, "Not found active training");
+      }
 
     res.status(201).json(result);
 };

middlewares/authenticate.js

@@ -1,7 +1,7 @@
 const jwt = require('jsonwebtoken');
 
 const { User } = require('../models/user');
-const RequestError = require('../helpers/index');
+const { RequestError } = require("../helpers");
 
 const { SECRET_KEY } = process.env;