Merge remote-tracking branch 'origin/release'

huridocs · Feb 24, 2021 · 2f4e816 · 2f4e816
2 parents 7cbaa44 + 021042c
commit 2f4e816
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/app/api/migrations/migrations/33-character-count-to-absolute-position/index.js b/app/api/migrations/migrations/33-character-count-to-absolute-position/index.js
@@ -119,15 +119,15 @@ async function existsRangesToConvert(db, file) {
     return true;
   }
 
-  const connections = await db
-    .collection('connections')
-    .find({ file: file._id.toString() })
-    .toArray();
+  const connections = (
+    await db
+      .collection('connections')
+      .find({ entity: file.entity, range: { $exists: true } })
+      .toArray()
+  ).filter(c => c.file === file._id.toString());
 
-  for (let i = 0; i < connections.length; i += 1) {
-    if (connections[i].range) {
-      return true;
-    }
+  if (connections.length) {
+    return true;
   }
 
   return false;
@@ -185,7 +185,10 @@ export default {
   async up(db) {
     process.stdout.write(`${this.name}...\n`);
     let conversionsNumber = 0;
-    const cursor = db.collection('files').find();
+    const cursor = db
+      .collection('files')
+      .find()
+      .addCursorFlag('noCursorTimeout', true);
     const wrongConversions = [];
     while (await cursor.hasNext()) {
       const file = await cursor.next();
@@ -233,6 +236,7 @@ export default {
     process.stderr.write(`Wrong conversions number: ${wrongConversions.length}\n`);
     process.stderr.write(`${wrongConversions.join('\n')}\n`);
 
+    cursor.close();
     return `${wrongConversions}`;
   },
 };