1.1.1

Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/62
Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "multi-stub",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "multi-stub",
-      "version": "1.1.0",
+      "version": "1.1.1",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.7.9",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "multi-stub",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "",
   "main": "index.js",
   "scripts": {

server/routers/dry-wash/arm-orders.js

@@ -1,13 +1,21 @@
 const router = require('express').Router()
 const { OrderModel } = require('./model/order')
 
-router.get('/orders', async (req, res, next) => {
-    try {
-        const orders = await OrderModel.find({})
+router.post('/orders', async (req, res, next) => {
+        const {startDate, endDate} = req.body
+
+        if (!startDate || !endDate) {
+                throw new Error('startDate and endDate are required')
+        }
+
+        const orders = await OrderModel.find({
+                $or: [
+                        {startWashTime: { $gte: new Date(startDate), $lte: new Date(endDate) }},
+                        {endWashTime: { $gte: new Date(startDate), $lte: new Date(endDate) }},
+                ]
+        })
+
         res.status(200).send({ success: true, body: orders })
-    } catch (error) {
-        next(error)
-    }
 })
 
 module.exports = router

server/routers/todo/comment.js

@@ -42,12 +42,12 @@ router.get('/:todoId/:itemId', async (req, res) => {
     return res.send(getAnswer(new Error('no such todo')))
   }
 
-  const item = await ItemModel.findById(itemId).populate('comments').exec()
+  const item = await ItemModel.findById(itemId).populate({ path: 'comments', populate: { path: 'author' } }).exec()
   if (!item) {
     return res.send(getAnswer(new Error('no such item')))
   }
 
-  res.send(getAnswer(null, item.comments))
+  res.send(getAnswer(null, item))
 })
 
 module.exports = router