From 0d9ec9d30ed2b294f8bdd7e994eb351f75c42a7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Tue, 28 Dec 2021 21:36:37 -0500
Subject: [PATCH] test: fix restore test

---
 src/topics/delete.js | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/topics/delete.js b/src/topics/delete.js
index 34d581e49d..553a8acb8e 100644
--- a/src/topics/delete.js
+++ b/src/topics/delete.js
@@ -11,14 +11,12 @@ const batch = require('../batch');
 
 module.exports = function (Topics) {
 	Topics.delete = async function (tid, uid) {
-		await Promise.all([
-			Topics.setTopicFields(tid, {
-				deleted: 1,
-				deleterUid: uid,
-				deletedTimestamp: Date.now(),
-			}),
-			removeTopicPidsFromCid(tid),
-		]);
+		await removeTopicPidsFromCid(tid);
+		await Topics.setTopicFields(tid, {
+			deleted: 1,
+			deleterUid: uid,
+			deletedTimestamp: Date.now(),
+		});
 	};
 
 	async function removeTopicPidsFromCid(tid) {
@@ -37,24 +35,20 @@ module.exports = function (Topics) {
 		]);
 		let postData = await posts.getPostsFields(pids, ['pid', 'timestamp', 'deleted']);
 		postData = postData.filter(post => post && !post.deleted);
-		const pidsToAdd = [];
-		const scores = [];
-		postData.forEach((post) => {
-			pidsToAdd.push(post.pid);
-			scores.push(post.timestamp);
-		});
+		const pidsToAdd = postData.map(post => post.pid);
+		const scores = postData.map(post => post.timestamp);
 		await db.sortedSetAdd(`cid:${cid}:pids`, scores, pidsToAdd);
 		await categories.updateRecentTidForCid(cid);
 	}
 
 	Topics.restore = async function (tid) {
-		await Topics.deleteTopicFields(tid, [
-			'deleterUid', 'deletedTimestamp',
-		]);
 		await Promise.all([
-			Topics.setTopicField(tid, 'deleted', 0),
+			Topics.deleteTopicFields(tid, [
+				'deleterUid', 'deletedTimestamp',
+			]),
 			addTopicPidsToCid(tid),
 		]);
+		await Topics.setTopicField(tid, 'deleted', 0);
 	};
 
 	Topics.purgePostsAndTopic = async function (tid, uid) {