Temp fix for conflicting migrations

w3c · Jan 11, 2024 · 6f8dfb9 · 6f8dfb9
1 parent 04cf7fc
commit 6f8dfb9
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 14 deletions.
diff --git a/server/migrations/20231219212344-recalculateV2TestHashes.js b/server/migrations/20231219212344-recalculateV2TestHashes.js
@@ -29,6 +29,7 @@ module.exports = {
                 testPlanVersionCount / testPlanVersionBatchSize
             );
 
+            const knownHashedTests = [];
             for (let i = 0; i < iterationsNeeded; i += 1) {
                 const multipleOf100 = i % testPlanVersionBatchSize === 0;
                 if (multipleOf100)
@@ -53,13 +54,28 @@ module.exports = {
                     testPlanVersions.map(async testPlanVersion => {
                         const hashedTests = hashTests(testPlanVersion.tests);
 
-                        await queryInterface.sequelize.query(
-                            `UPDATE "TestPlanVersion" SET "hashedTests" = ? WHERE id = ?`,
-                            {
-                                replacements: [hashedTests, testPlanVersion.id],
-                                transaction
-                            }
-                        );
+                        if (!knownHashedTests.includes(hashedTests)) {
+                            knownHashedTests.push(hashedTests);
+                            await queryInterface.sequelize.query(
+                                `UPDATE "TestPlanVersion" SET "hashedTests" = ? WHERE id = ?`,
+                                {
+                                    replacements: [
+                                        hashedTests,
+                                        testPlanVersion.id
+                                    ],
+                                    transaction
+                                }
+                            );
+                        } else {
+                            // Remove any accidentally created TestPlanVersion rows
+                            await queryInterface.sequelize.query(
+                                `DELETE FROM "TestPlanVersion" WHERE id = ?`,
+                                {
+                                    replacements: [testPlanVersion.id],
+                                    transaction
+                                }
+                            );
+                        }
                     })
                 );
             }

diff --git a/server/migrations/20240104150500-includeAdditionalTestFormatVersionAttributes.js b/server/migrations/20240104150500-includeAdditionalTestFormatVersionAttributes.js
@@ -28,6 +28,7 @@ module.exports = {
                 testPlanVersionCount / testPlanVersionBatchSize
             );
 
+            const knownHashedTests = [];
             for (let i = 0; i < iterationsNeeded; i += 1) {
                 const multipleOf100 = i % testPlanVersionBatchSize === 0;
                 if (multipleOf100)
@@ -52,13 +53,28 @@ module.exports = {
                     testPlanVersions.map(async testPlanVersion => {
                         const hashedTests = hashTests(testPlanVersion.tests);
 
-                        await queryInterface.sequelize.query(
-                            `UPDATE "TestPlanVersion" SET "hashedTests" = ? WHERE id = ?`,
-                            {
-                                replacements: [hashedTests, testPlanVersion.id],
-                                transaction
-                            }
-                        );
+                        if (!knownHashedTests.includes(hashedTests)) {
+                            knownHashedTests.push(hashedTests);
+                            await queryInterface.sequelize.query(
+                                `UPDATE "TestPlanVersion" SET "hashedTests" = ? WHERE id = ?`,
+                                {
+                                    replacements: [
+                                        hashedTests,
+                                        testPlanVersion.id
+                                    ],
+                                    transaction
+                                }
+                            );
+                        } else {
+                            // Remove any accidentally created TestPlanVersion rows
+                            await queryInterface.sequelize.query(
+                                `DELETE FROM "TestPlanVersion" WHERE id = ?`,
+                                {
+                                    replacements: [testPlanVersion.id],
+                                    transaction
+                                }
+                            );
+                        }
                     })
                 );
             }