fix(Policies): nested data inception

opencollective · Jan 30, 2025 · 39caeeb · 39caeeb
1 parent 421e385
commit 39caeeb
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 2 deletions.
diff --git a/migrations/20250130072503-fix-nested-collecives-data.js b/migrations/20250130072503-fix-nested-collecives-data.js
@@ -0,0 +1,41 @@
+'use strict';
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    await queryInterface.sequelize.query(`
+      WITH updated_collectives AS (
+        UPDATE "Collectives"
+        SET "data" =
+          -- Merge "data" into nested data, to make sure newly created keys aren't dropped
+          (data->'data' || data)
+          -- Make sure any policy created in (data->'data'->'policies'->'EXPENSE_POLICIES') is merged with the top level policies
+          || JSONB_BUILD_OBJECT(
+            'policies',
+            COALESCE(data->'data'->'policies', '{}')
+            || COALESCE(data->'policies', '{}')
+            || JSONB_BUILD_OBJECT('EXPENSE_POLICIES', COALESCE(data->'data'->'policies'->'EXPENSE_POLICIES', '{}'))
+          )
+        WHERE data ? 'data'
+        RETURNING id, data
+      ) INSERT INTO "MigrationLogs" ("type", "description", "data", "createdAt")
+        SELECT
+          'MIGRATION',
+          '20250130072503-fix-nested-collecives-data',
+          jsonb_agg(jsonb_build_object('id', id, 'data', data)),
+          NOW()
+        FROM updated_collectives
+        RETURNING id
+    `);
+
+    await queryInterface.sequelize.query(`
+      UPDATE "Collectives"
+      SET "data" = data - 'data'
+      WHERE data ? 'data'
+    `);
+  },
+
+  async down(queryInterface, Sequelize) {
+    console.log('Please look at the migration logs to see the data that was migrated');
+  },
+};
diff --git a/server/models/Collective.ts b/server/models/Collective.ts
@@ -3746,7 +3746,7 @@ Collective.init(
               receiptPolicy: sanitizeHTML(expensePolicy, optsSanitizeHtmlForSimplified),
             },
           };
-          this.setDataValue('data', { data: { ...data, policies: newPolicies } });
+          this.setDataValue('data', { ...data, policies: newPolicies });
         } else {
           const data = this.getDataValue('data');
           const newPolicies = {
@@ -3757,7 +3757,7 @@ Collective.init(
               receiptPolicy: '',
             },
           };
-          this.setDataValue('data', { data: { ...data, policies: newPolicies } });
+          this.setDataValue('data', { ...data, policies: newPolicies });
         }
       },
     },