Dist (#15)

* добавляет реэкспорт отзыва в котроллерах

* some part from statistics

* fix schema swagger

* small fix swagger and routes

Co-authored-by: Kseniia <[email protected]>
Co-authored-by: nestakiev <[email protected]>

Author: 3 people

FinalProjectReact-Node-Back

@@ -0,0 +1 @@
+Subproject commit 4ec02a6a5a484ea7b575647113c9e5ebfea403d3

app.js

@@ -12,6 +12,7 @@ const authRouter = require('./routes/api/auth');
 /* const usersRouter = require("./routes/api/users"); */
 
 const booksRouter = require("./routes/api/books");
+const statsRouter = require("./routes/api/stats");
 
 // const statsRouter = require("./routes/api/stats");
 
@@ -23,13 +24,15 @@ const formatsLogger = app.get("env") === "development" ? "dev" : "short";
 app.use(logger(formatsLogger));
 app.use(cors());
 app.use(express.json());
-app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerDocument));
+app.use('/', swaggerUi.serve, swaggerUi.setup(swaggerDocument));
 app.use(express.static("public"))
 
 app.use('/api/auth', authRouter);
 /* app.use("/api/users", usersRouter); */
 
 app.use("/api/books", booksRouter);
+app.use("/api/training", statsRouter);
+
 
 // app.use("/api/stats", statsRouter);
 

controllers/books/index.js

@@ -1,7 +1,9 @@
 const add = require("./add");
 const getAll = require("./getAll");
+const updateResume = require("./updateResume");
 
 module.exports = {
     add,
     getAll,
+    updateResume
 }

controllers/stat/addDailyStats.js

@@ -0,0 +1,33 @@
+const { Book } = require("../../models/book");
+const { Stat } = require("../../models/stat");
+
+const { RequestError } = require("../../helpers");
+
+const addStatistics = async (req, res) => {
+//   const {book, start, end} = req.body;
+
+//   if (book.length < 1) {
+//     throw RequestError(400, "Bad request");
+//   }
+
+//   try {
+//     book.forEach(async (item) => {
+//       await Book.findByIdAndUpdate(item.id, { status: "in progress" });
+//     });
+//   } catch (err) {
+//     throw RequestError(500, err);
+//   }
+
+//   const newTraining = {
+//     active: book,
+//     start,
+//     end
+//   };
+
+//   const result = Stat.create(newTraining);
+
+//   res.status(201).json(result);
+};
+
+module.exports = addStatistics;
+

controllers/stat/addTraining.js

@@ -0,0 +1,32 @@
+const { Book } = require("../../models/book");
+const { Stat } = require("../../models/stat");
+
+const { RequestError } = require("../../helpers");
+
+const addTraining = async (req, res) => {
+  const {book, start, end} = req.body;
+
+  if (book.length < 1) {
+    throw RequestError(400, "Bad request");
+  }
+
+  try {
+    book.forEach(async (item) => {
+      await Book.findByIdAndUpdate(item.id, { status: "in progress" });
+    });
+  } catch (err) {
+    throw RequestError(500, err);
+  }
+
+  const newTraining = {
+    active: book,
+    start,
+    end
+  };
+
+  const result = Stat.create(newTraining);
+
+  res.status(201).json(result);
+};
+
+module.exports = addTraining;

controllers/stat/getStatistics.js

@@ -0,0 +1,16 @@
+const { Stat } = require("../../models/stat");
+const { RequestError } = require("../../helpers");
+
+const getStatistics = async (req, res) => {
+    const { _id } = req.user;
+
+    const result = Stat.findOne({owner: _id})
+
+    if (!result) {
+        throw RequestError(500, "Something went wrong");
+    }
+
+    res.status(201).json(result);
+};
+
+module.exports = getStatistics;

controllers/stat/index.js

@@ -0,0 +1,9 @@
+const addTraining = require("./addTraining");
+const addDailyStats = require("./addDailyStats");
+const getStatistics = require("./getStatistics");
+
+module.exports = {
+    addTraining,
+    addDailyStats,
+    getStatistics
+};

middlewares/index.js

@@ -1,9 +1,9 @@
 const validationBody = require('./validationBody');
 const authenticate = require('./authenticate');
-
+const isValidId = require("./isValidId");
 
 module.exports = {
     validationBody,
     authenticate,
-
+    isValidId
 }

models/book.js

@@ -3,6 +3,7 @@ const Joi = require("joi");
 const { handleSchemaValidationErrors } = require("../helpers");
 
 const statusKind = ["plan", "in progress", "finished"];
+const ratingKind = ["1", "2", "3", "4", "5", null];
 
 const bookSchema = new Schema ({
     title: {
@@ -26,21 +27,21 @@ const bookSchema = new Schema ({
         enum: statusKind,
         default: "plan",
       },
-    //   resume: {
-    //     comment: {
-    //       type: String,
-    //       default: null,
-    //     },
-    //     rating: {
-    //       type: String,
-    //       enum: ["1", "2", "3", "4", "5"],
-    //       default: null,
-    //     },
-    //   },
-    //   owner: {
-    //     type: Schema.Types.ObjectId,
-    //     ref: "User",
-    //   },
+      resume: {
+        comment: {
+          type: String,
+          default: null,
+        },
+        rating: {
+          type: String,
+          enum: ["1", "2", "3", "4", "5"],
+          default: null,
+        },
+      },
+      owner: {
+        type: Schema.Types.ObjectId,
+        ref: "User",
+      },
 }, { versionKey: false, timestamps: true });
 
 bookSchema.post("save", handleSchemaValidationErrors);
@@ -55,9 +56,14 @@ const addSchema = Joi.object({
     status: Joi.string().valueOf(...statusKind),
   })
 
+  const updateResumeSchema = Joi.object({
+    comment: Joi.string().required(),
+    rating: Joi.string().valueOf(...ratingKind)
+})
+
   const schemas = {
     addSchema,
-    
+    updateResumeSchema
   }
 
 const Book = model("book", bookSchema);

models/stat.js

@@ -0,0 +1,68 @@
+const { Schema, model } = require("mongoose");
+const Joi = require("joi");
+const { handleSchemaValidationErrors } = require("../helpers");
+
+const statSchema = new Schema(
+  {
+    training: {
+      active: [
+        {
+          book: {
+            type: Schema.Types.ObjectId,
+            ref: "Book",
+          },
+        },
+      ],
+      start: {
+        type: Date,
+        default: null,
+      },
+      end: {
+        type: Date,
+        default: null,
+      },
+    },
+    statistic: [
+      {
+        date: {
+          type: Date,
+          default: null,
+        },
+        pages: {
+          type: String,
+          default: null,
+        },
+      },
+    ],
+    owner: {
+      type: Schema.Types.ObjectId,
+      ref: "User",
+    },
+  },
+  { versionKey: false, timestamps: true }
+);
+
+statSchema.post("save", handleSchemaValidationErrors);
+
+const addTrainSchema = Joi.object({
+  book: Joi.array().items(Joi.string().length(24)).min(1).required(),
+  start: Joi.date().timestamp().required(),
+  end: Joi.date().timestamp().required(),
+});
+
+const addDailyStatsSchema = Joi.object({
+  date: Joi.date().timestamp().required(),
+  pages: Joi.string().pattern(/\d/).required(),
+});
+
+const schemas = {
+  addTrainSchema,
+  addDailyStatsSchema,
+};
+
+const Stat = model("stat", statSchema);
+
+module.exports = {
+  Stat,
+  schemas,
+};