fix: Out of order issue when getting list of comments

Author: guosw

server/controllers/article.js

@@ -76,16 +76,17 @@ class ArticleController {
             model: CommentModel,
             attributes: ['id', 'content', 'createdAt'],
             include: [
-              { model: UserModel, as: 'user', attributes: ['id', 'username', 'role', 'github'] },
               {
                 model: ReplyModel,
-                attributes: ['id', 'userId', 'content', 'createdAt'],
-                include: [{ model: UserModel, as: 'user', attributes: ['id', 'username', 'role', 'github'] }]
-              }
-            ]
+                attributes: ['id', 'content', 'createdAt'],
+                include: [{ model: UserModel, as: 'user', attributes: { exclude: ['updatedAt', 'password'] } }]
+              },
+              { model: UserModel, as: 'user', attributes: { exclude: ['updatedAt', 'password'] } }
+            ],
+            row: true
           }
         ],
-        order: [[CommentModel, 'createdAt', 'DESC']], // comment model order
+        order: [[CommentModel, 'createdAt', 'DESC'], [[CommentModel, ReplyModel, 'createdAt', 'ASC']]], // comment model order
         row: true
       })
 
@@ -279,7 +280,7 @@ class ArticleController {
       const upStream = fs.createWriteStream(filePath)
       reader.pipe(upStream)
 
-      reader.on('end', function() {
+      reader.on('end', function () {
         console.log('上传成功')
       })
     }

server/controllers/discuss.js

@@ -69,7 +69,7 @@ class DiscussController {
           await ReplyModel.create({ userId, articleId, content, commentId })
         }
         await IpModel.findOrCreate({ where: { ip }, defaults: { userId, ip } })
-        const list = await DiscussController.fetchCommentList(articleId)
+        const list = await DiscussController.fetchDiscussList(articleId)
 
         EMAIL_NOTICE.enable && sendingEmail(articleId, list, commentId, userId)
 
@@ -106,7 +106,7 @@ class DiscussController {
     }
   }
 
-  static async fetchCommentList(articleId) {
+  static async fetchDiscussList(articleId) {
     const data = await CommentModel.findAndCountAll({
       where: { articleId },
       attributes: ['id', 'content', 'createdAt'],
@@ -119,7 +119,7 @@ class DiscussController {
         { model: UserModel, as: 'user', attributes: { exclude: ['updatedAt', 'password'] } }
       ],
       row: true,
-      order: [['createdAt', 'DESC']]
+      order: [['createdAt', 'DESC'], [ReplyModel, 'createdAt', 'ASC']]
     })
 
     // 格式化 github