From 8f63a269a88dcab8580ff0615c7ade95bf67abdb Mon Sep 17 00:00:00 2001
From: Murod Khaydarov <murod.haydarov@gmail.com>
Date: Wed, 16 Jan 2019 23:40:56 +0300
Subject: [PATCH] requested changes

---
 src/controllers/pagesOrder.js | 12 ++++++------
 src/models/pageOrder.js       | 14 +++++++-------
 src/routes/api/pages.js       |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/controllers/pagesOrder.js b/src/controllers/pagesOrder.js
index a05595a..d65ce0e 100644
--- a/src/controllers/pagesOrder.js
+++ b/src/controllers/pagesOrder.js
@@ -41,28 +41,28 @@ class PagesOrder {
    *
    * @param {string} oldParentId - old parent page's id
    * @param {string} newParentId - new parent page's id
-   * @param {string} childId - page's id which is changing the parent page
+   * @param {string} targetPageId - page's id which is changing the parent page
    */
-  static async renew(oldParentId, newParentId, childId) {
+  static async move(oldParentId, newParentId, targetPageId) {
     const oldParentOrder = await Model.get(oldParentId);
 
-    oldParentOrder.remove(childId);
+    oldParentOrder.remove(targetPageId);
     oldParentOrder.save();
 
     const newParentOrder = await Model.get(newParentId);
 
-    newParentOrder.push(childId);
+    newParentOrder.push(targetPageId);
     await newParentOrder.save();
   }
 
   /**
    * Returns new array with ordered pages
    *
-   * @param {Array<Page>} pages - list of all available pages
+   * @param {Page[]} pages - list of all available pages
    * @param {string} currentPageId - page's id around which we are ordering
    * @param {string} parentPageId - parent page's id that contains page above
    * @param {Boolean} ignoreSelf - should we ignore current page in list or not
-   * @return Array<Page>
+   * @return {Page[]}
    */
   static async getOrderedChildren(pages, currentPageId, parentPageId, ignoreSelf = false) {
     const children = await PagesOrder.get(parentPageId);
diff --git a/src/models/pageOrder.js b/src/models/pageOrder.js
index 11bb924..5a0fc11 100644
--- a/src/models/pageOrder.js
+++ b/src/models/pageOrder.js
@@ -17,15 +17,15 @@ class PageOrder {
   /**
    * Returns current Page's children order
    *
-   * @param page
+   * @param {string} pageId - page's id
    */
-  static async get(page) {
-    const order = await db.findOne({page});
+  static async get(pageId) {
+    const order = await db.findOne({page: pageId});
 
     let data = {};
 
     if (!order) {
-      data.page = page;
+      data.page = pageId;
     } else {
       data = order;
     }
@@ -74,7 +74,7 @@ class PageOrder {
   /**
    * Pushes page id to the orders array
    *
-   * @param {string} pageId
+   * @param {string} pageId - page's id
    */
   push(pageId) {
     this._order.push(pageId);
@@ -83,7 +83,7 @@ class PageOrder {
   /**
    * Removes page id from orders array
    *
-   * @param {string} pageId
+   * @param {string} pageId - page's id
    */
   remove(pageId) {
     const found = this._order.indexOf(pageId);
@@ -96,7 +96,7 @@ class PageOrder {
   /**
    * Returns ordered list
    *
-   * @return {Array<string>}
+   * @return {string[]}
    */
   get order() {
     return this._order;
diff --git a/src/routes/api/pages.js b/src/routes/api/pages.js
index 8f918eb..5fb85ae 100644
--- a/src/routes/api/pages.js
+++ b/src/routes/api/pages.js
@@ -84,7 +84,7 @@ router.post('/page/:id', multer.any(), async (req, res) => {
     let page = await Pages.get(id);
 
     if (page._parent !== parent) {
-      await PagesOrder.renew(page._parent, parent, id);
+      await PagesOrder.move(page._parent, parent, id);
     } else {
       await PagesOrder.update(page._id, page._parent, putAbovePageId);
     }