perf: misc enhancements (#10550)

opencollective · Dec 19, 2024 · 83ba678 · 83ba678
1 parent 7b4d82a
commit 83ba678
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/migrations/20241218093842-confirm-email-token-index.js b/migrations/20241218093842-confirm-email-token-index.js
@@ -0,0 +1,18 @@
+'use strict';
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    await queryInterface.addIndex('Users', ['emailConfirmationToken'], {
+      unique: true,
+      where: {
+        deletedAt: { [Sequelize.Op.eq]: null },
+        emailConfirmationToken: { [Sequelize.Op.ne]: null },
+      },
+    });
+  },
+
+  async down(queryInterface, Sequelize) {
+    await queryInterface.removeIndex('Users', ['emailConfirmationToken']);
+  },
+};
diff --git a/server/graphql/loaders/index.js b/server/graphql/loaders/index.js
@@ -616,6 +616,7 @@ export const loaders = req => {
         AND "Transaction"."RefundTransactionId" IS NULL
         AND "Transaction"."type" = 'CREDIT'
         AND "Transaction"."kind" IN ('CONTRIBUTION', 'ADDED_FUNDS')
+        AND "Transaction"."deletedAt" IS NULL
         GROUP BY "Order"."TierId";
       `,
         {

diff --git a/server/lib/queries.js b/server/lib/queries.js
@@ -378,6 +378,8 @@ const getGiftCardBatchesForCollective = async collectiveId => {
     FROM "PaymentMethods" pm
     INNER JOIN "PaymentMethods" spm ON pm."SourcePaymentMethodId" = spm.id
     WHERE spm."CollectiveId" = :collectiveId
+    AND pm."deletedAt" IS NULL
+    AND spm."deletedAt" IS NULL
     GROUP BY pm.batch
     ORDER BY pm.batch ASC
   `,