specify sequelize association

opencollective · May 13, 2024 · 45b4d67 · 45b4d67
1 parent 0d31ba0
commit 45b4d67
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/server/models/Order.ts b/server/models/Order.ts
@@ -242,7 +242,7 @@ class Order extends Model<InferAttributes<Order>, InferCreationAttributes<Order>
     await models.Activity.create({
       type: ActivityTypes.ORDER_PENDING_EXPIRED,
       UserId: user?.id,
-      CollectiveId: toAccount.id,
+      CollectiveId: toAccount?.id,
       FromCollectiveId: this.FromCollectiveId,
       OrderId: this.id,
       HostCollectiveId: host?.id,

diff --git a/server/paymentProviders/stripe/webhook.ts b/server/paymentProviders/stripe/webhook.ts
@@ -334,7 +334,7 @@ export const chargeDisputeCreated = async (event: Stripe.Event) => {
           {
             model: models.Collective,
             as: 'collective',
-            include: [{ model: models.Collective, as: 'host', required: false }],
+            include: [{ model: models.Collective, as: 'host', foreignKey: 'HostCollectiveId', required: true }],
           },
           { model: models.Collective, as: 'fromCollective' },
           models.Tier,
@@ -364,7 +364,7 @@ export const chargeDisputeCreated = async (event: Stripe.Event) => {
       HostCollectiveId: order.collective.HostCollectiveId,
       data: {
         order: order.info,
-        fromAccountInfo: order.data.fromAccountInfo,
+        fromAccountInfo: order.data?.fromAccountInfo,
         fromCollective: order.fromCollective.info,
         host: order.collective.host?.info,
         toCollective: order.collective.info,
@@ -420,7 +420,7 @@ export const chargeDisputeClosed = async (event: Stripe.Event) => {
           {
             model: models.Collective,
             as: 'collective',
-            include: [{ model: models.Collective, as: 'host', required: false }],
+            include: [{ model: models.Collective, as: 'host', foreignKey: 'HostCollectiveId', required: true }],
           },
           { model: models.Collective, as: 'fromCollective' },
           models.Tier,
@@ -448,7 +448,7 @@ export const chargeDisputeClosed = async (event: Stripe.Event) => {
       HostCollectiveId: order.collective.HostCollectiveId,
       data: {
         order: order.info,
-        fromAccountInfo: order.data.fromAccountInfo,
+        fromAccountInfo: order.data?.fromAccountInfo,
         fromCollective: order.fromCollective.info,
         host: order.collective.host?.info,
         toCollective: order.collective.info,
@@ -596,9 +596,10 @@ export const reviewOpened = async (event: Stripe.Event) => {
           {
             model: models.Collective,
             as: 'collective',
-            include: [{ model: models.Collective, as: 'collective', required: true }],
+            foreignKey: 'CollectiveId',
+            include: [{ model: models.Collective, as: 'host', foreignKey: 'HostCollectiveId', required: true }],
           },
-          { model: models.Collective, as: 'fromCollective' },
+          { model: models.Collective, as: 'fromCollective', foreignKey: 'FromCollectiveId' },
           models.Tier,
         ],
       },
@@ -620,7 +621,7 @@ export const reviewOpened = async (event: Stripe.Event) => {
       HostCollectiveId: order.collective.HostCollectiveId,
       data: {
         order: order.info,
-        fromAccountInfo: order.data.fromAccountInfo,
+        fromAccountInfo: order.data?.fromAccountInfo,
         fromCollective: order.fromCollective.info,
         host: order.collective.host.info,
         toCollective: order.collective.info,
@@ -678,10 +679,11 @@ export const reviewClosed = async (event: Stripe.Event) => {
           { model: models.Subscription, required: false },
           {
             model: models.Collective,
+            as: 'collective',
             foreignKey: 'CollectiveId',
-            include: [{ model: models.Collective, foreignKey: 'HostCollectiveId', required: false }],
+            include: [{ model: models.Collective, as: 'host', foreignKey: 'HostCollectiveId', required: true }],
           },
-          { model: models.Collective, as: 'fromCollective' },
+          { model: models.Collective, as: 'fromCollective', foreignKey: 'FromCollectiveId' },
           models.Tier,
         ],
       },
@@ -721,7 +723,7 @@ export const reviewClosed = async (event: Stripe.Event) => {
       HostCollectiveId: order.collective.HostCollectiveId,
       data: {
         order: order.info,
-        fromAccountInfo: order.data.fromAccountInfo,
+        fromAccountInfo: order.data?.fromAccountInfo,
         fromCollective: order.fromCollective.info,
         host: order.collective.host?.info,
         toCollective: order.collective.info,