From 5a1be35d719bf2b34999d2dfdd3856e4c70b1e51 Mon Sep 17 00:00:00 2001
From: Y-k-Y <zzzzz.co.kr@gmail.com>
Date: Fri, 29 Apr 2022 10:02:00 +0900
Subject: [PATCH] refactor: fix method names and variables also split methods
 to be clear their role

---
 src/backend/controllers/pages.ts | 59 +++++++++++++++++++++++---------
 src/backend/routes/pages.ts      |  3 +-
 2 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/src/backend/controllers/pages.ts b/src/backend/controllers/pages.ts
index 59f8c33..da59766 100644
--- a/src/backend/controllers/pages.ts
+++ b/src/backend/controllers/pages.ts
@@ -63,16 +63,13 @@ class Pages {
   }
 
   /**
-   * Group given pages with descending order of creation time
+   * Sort given pages with descending order of creation time
    *
-   * @param {pages[]} pages - pages to group
-   * @returns {Page[]}
+   * @param {pages[]} pages - pages to sort
+   * @returns {page[]}
    */
-  public static group(pages: Page[]): Page[] {
-    const result: Page[] = [];
-    const obj:Record<string, Array<Page>> = {};
-
-    pages.sort((a, b) => {
+  public static sortByTimeDesc(pages: Page[]): Page[] {
+    return pages.sort((a, b) => {
       if (a.body.time > b.body.time) {
         return 1;
       }
@@ -82,18 +79,36 @@ class Pages {
       }
 
       return 0;
-    }).forEach(doc => {
-      if (doc._parent === '0' && typeof doc._id === 'string') {
-        obj[doc._id] = [];
-        obj[doc._id].push(doc);
-      } else if (doc._parent !== '0' && doc._parent && doc._id) {
-        obj[doc._id] = [];
-        obj[doc._parent].push(doc);
+    });
+  }
+
+
+  /**
+   * Group given pages by their parents
+   *
+   * @param {pages[]} pages - pages to group
+   * @returns {Page[]}
+   */
+  public static groupByParent(pages: Page[]): Page[] {
+    const result: Page[] = [];
+    const pagesGroupedByParent:Record<string, Array<Page>> = {};
+
+    pages.forEach(page => {
+      pagesGroupedByParent[String(page._id)] = [];
+
+      if (this.isRootPage(page)) {
+        pagesGroupedByParent[String(page._id)].push(page);
+      } else {
+        pagesGroupedByParent[String(page._parent)].push(page);
       }
     });
 
-    Object.entries(obj).forEach(([, value]) => {
-      if (value.length <=0) {
+    /**
+     * It converts grouped object to array
+     * Also removes redundant keys when there is no children
+     */
+    Object.entries(pagesGroupedByParent).forEach(([, value]) => {
+      if (value.length <= 0) {
         return;
       } else {
         result.push(...value);
@@ -244,6 +259,16 @@ class Pages {
       throw new Error('Please, fill page Header');
     }
   }
+
+  /**
+   * Check if the given page is root
+   *
+   * @param {page} page - page to check
+   * @returns {boolean}
+   */
+  private static isRootPage(page:Page):boolean {
+    return page._parent === '0';
+  }
 }
 
 export default Pages;
diff --git a/src/backend/routes/pages.ts b/src/backend/routes/pages.ts
index 174abb9..1efcc4f 100644
--- a/src/backend/routes/pages.ts
+++ b/src/backend/routes/pages.ts
@@ -12,7 +12,8 @@ const router = express.Router();
 router.get('/page/new', verifyToken, allowEdit, async (req: Request, res: Response, next: NextFunction) => {
   try {
     const pagesAvailable = await Pages.getAll();
-    const groupedPagesAvailable = Pages.group(pagesAvailable);
+    const sortedPagesAvailable = Pages.sortByTimeDesc(pagesAvailable);
+    const groupedPagesAvailable = Pages.groupByParent(sortedPagesAvailable);
 
     res.render('pages/form', {
       groupedPagesAvailable,