From e08ea43db15cc812c18190e5703c50cd2160f1fd Mon Sep 17 00:00:00 2001 From: zkldi <20380519+zkldi@users.noreply.github.com> Date: Thu, 9 Dec 2021 21:26:18 +0000 Subject: [PATCH] Deterministic Collection Sort never did anything for folders or tables... --- database-seeds/scripts/deterministic-collection-sort.js | 9 ++++++++- database-seeds/scripts/export.js | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/database-seeds/scripts/deterministic-collection-sort.js b/database-seeds/scripts/deterministic-collection-sort.js index db97e028a..bec195d8d 100644 --- a/database-seeds/scripts/deterministic-collection-sort.js +++ b/database-seeds/scripts/deterministic-collection-sort.js @@ -27,9 +27,16 @@ function DeterministicCollectionSort() { if (collection.startsWith("charts-")) { content.sort(ChartSort); } - if (collection.startsWith("songs-")) { + else if (collection.startsWith("songs-")) { content.sort((a, b) => a.id - b.id); } + else if (collection.startsWith("folders")) { + content.sort((a, b) => a.folderID.localeCompare(b.folderID)); + } + else if (collection.startsWith("folders")) { + content.sort((a, b) => a.tableID.localeCompare(b.tableID)); + } + content = content.map(SortObjectKeys); diff --git a/database-seeds/scripts/export.js b/database-seeds/scripts/export.js index 354b9c884..6d34cb872 100644 --- a/database-seeds/scripts/export.js +++ b/database-seeds/scripts/export.js @@ -50,9 +50,10 @@ if (options.all) { await ExportCollection(collection); } - DeterministicCollectionSort(); RemoveUnderscoreID(); + DeterministicCollectionSort(); + logger.info(`Done!`); process.exit(0);