fix(Webhooks): account association

migrations/20241024103852-remove-invalid-webhooks.js

@@ -0,0 +1,40 @@
+'use strict';
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  async up(queryInterface) {
+    const webhooks = await queryInterface.sequelize.query(
+      `
+      DELETE FROM "Notifications"
+      WHERE channel = 'webhook'
+      AND "CollectiveId" IS NULL
+      RETURNING *
+    `,
+      {
+        type: queryInterface.sequelize.QueryTypes.SELECT,
+      },
+    );
+
+    await queryInterface.sequelize.query(
+      `
+      INSERT INTO "MigrationLogs"
+      ("createdAt", "type", "description", "CreatedByUserId", "data")
+      VALUES (
+        NOW(),
+        'MIGRATION',
+        'migrations/20241024103852-remove-invalid-webhooks',
+        NULL,
+        :data
+      )
+    `,
+      {
+        replacements: { data: JSON.stringify(webhooks) },
+        type: queryInterface.sequelize.QueryTypes.INSERT,
+      },
+    );
+  },
+
+  async down() {
+    console.log(`No restore for this migration, look at the migration log for the deleted webhooks`);
+  },
+};

server/graphql/v2/mutation/WebhookMutations.js

@@ -38,7 +38,7 @@ const createWebhook = {
       type: args.webhook.activityType,
       webhookUrl: args.webhook.webhookUrl,
       UserId: req.remoteUser.id,
-      CollectiveId: account.CollectiveId,
+      CollectiveId: account.id,
     };
 
     return models.Notification.create(createParams);

server/graphql/v2/object/Webhook.js

@@ -36,7 +36,9 @@ export const GraphQLWebhook = new GraphQLObjectType({
     account: {
       type: new GraphQLNonNull(GraphQLAccount),
       resolve(notification, args, req) {
-        return req.loaders.Collective.byId.load(notification.CollectiveId);
+        if (notification.CollectiveId) {
+          return req.loaders.Collective.byId.load(notification.CollectiveId);
+        }
       },
     },
   }),