Update group plan selection to include expired plans

2026-01-13 12:40:20 -06:00
parent f6cc11771f
commit 9712d78fd3
3 changed files with 14 additions and 5 deletions
@@ -309,13 +309,16 @@ schema.statics.getGroups = async function getGroups (options = {}) {
          privacy: 'private',
          _id: { $in: user.guilds },
          'purchased.plan.customerId': { $exists: true },
-          $or: [
+        };
+        if (!filters.includeExpiredPlans) {
+          query.$or = [
            { 'purchased.plan.dateTerminated': null },
            { 'purchased.plan.dateTerminated': { $exists: false } },
            { 'purchased.plan.dateTerminated': { $gt: new Date() } },
-          ],
-        };
-        _.assign(query, filters);
+          ];
+        }
+        const filtersWithoutCustom = _.omit(filters, ['includeExpiredPlans']);
+        _.assign(query, filtersWithoutCustom);
        const privateGuildsQuery = this.find(query).select(groupFields);
        if (populateLeader === true) privateGuildsQuery.populate('leader', nameFields);
        privateGuildsQuery.sort(sort);