ghost 6.8.1 → 6.9.0

package/core/server/data/tinybird/tests/api_top_utm_contents.yaml

@@ -12,28 +12,6 @@
     {"utm_content":"search_ad","visits":1}
     {"utm_content":"header_link","visits":1}
 
-- name: Filtered by browser - Chrome
-  description: Filtered by browser - Chrome
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&browser=chrome
-  expected_result: |
-    {"utm_content":"post_123","visits":1}
-    {"utm_content":"video_ad","visits":1}
-    {"utm_content":"story_789","visits":1}
-    {"utm_content":"banner_ad","visits":1}
-
-- name: Filtered by device - desktop
-  description: Filtered by device - desktop
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop
-  expected_result: |
-    {"utm_content":"post_123","visits":1}
-    {"utm_content":"video_ad","visits":1}
-    {"utm_content":"story_789","visits":1}
-    {"utm_content":"sponsored_post","visits":1}
-    {"utm_content":"tweet_456","visits":1}
-    {"utm_content":"banner_ad","visits":1}
-    {"utm_content":"search_ad","visits":1}
-    {"utm_content":"header_link","visits":1}
-
 - name: Filtered by location - UK
   description: Filtered by location - UK
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&location=GB
@@ -43,19 +21,6 @@
     {"utm_content":"banner_ad","visits":1}
     {"utm_content":"header_link","visits":1}
 
-- name: Filtered by OS - Windows
-  description: Filtered by OS - Windows
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&os=windows
-  expected_result: |
-    {"utm_content":"post_123","visits":1}
-    {"utm_content":"video_ad","visits":1}
-    {"utm_content":"story_789","visits":1}
-    {"utm_content":"sponsored_post","visits":1}
-    {"utm_content":"tweet_456","visits":1}
-    {"utm_content":"banner_ad","visits":1}
-    {"utm_content":"search_ad","visits":1}
-    {"utm_content":"header_link","visits":1}
-
 - name: Filtered by pathname - /about/
   description: Filtered by pathname - /about/
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&pathname=%2Fabout%2F
@@ -110,8 +75,7 @@
 
 - name: Test with multiple filters combined
   description: Test with multiple filters combined
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop&browser=firefox
+  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com&pathname=%2Fabout%2F
   expected_result: |
-    {"utm_content":"sponsored_post","visits":1}
-    {"utm_content":"tweet_456","visits":1}
-    {"utm_content":"search_ad","visits":1}
+    {"utm_content":"story_789","visits":1}
+    {"utm_content":"header_link","visits":1}

package/core/server/data/tinybird/tests/api_top_utm_mediums.yaml

@@ -10,26 +10,6 @@
     {"utm_medium":"display","visits":1}
     {"utm_medium":"email","visits":1}
 
-- name: Filtered by browser - Chrome
-  description: Filtered by browser - Chrome
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&browser=chrome
-  expected_result: |
-    {"utm_medium":"social","visits":2}
-    {"utm_medium":"organic","visits":1}
-    {"utm_medium":"referral","visits":1}
-    {"utm_medium":"display","visits":1}
-
-- name: Filtered by device - desktop
-  description: Filtered by device - desktop
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop
-  expected_result: |
-    {"utm_medium":"social","visits":5}
-    {"utm_medium":"cpc","visits":1}
-    {"utm_medium":"organic","visits":1}
-    {"utm_medium":"referral","visits":1}
-    {"utm_medium":"display","visits":1}
-    {"utm_medium":"email","visits":1}
-
 - name: Filtered by location - UK
   description: Filtered by location - UK
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&location=GB
@@ -41,17 +21,6 @@
     {"utm_medium":"display","visits":1}
     {"utm_medium":"email","visits":1}
 
-- name: Filtered by OS - Windows
-  description: Filtered by OS - Windows
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&os=windows
-  expected_result: |
-    {"utm_medium":"social","visits":5}
-    {"utm_medium":"cpc","visits":1}
-    {"utm_medium":"organic","visits":1}
-    {"utm_medium":"referral","visits":1}
-    {"utm_medium":"display","visits":1}
-    {"utm_medium":"email","visits":1}
-
 - name: Filtered by pathname - /about/
   description: Filtered by pathname - /about/
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&pathname=%2Fabout%2F
@@ -104,7 +73,7 @@
 
 - name: Test with multiple filters combined
   description: Test with multiple filters combined
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop&browser=firefox
+  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com&pathname=%2Fabout%2F
   expected_result: |
-    {"utm_medium":"social","visits":3}
-    {"utm_medium":"cpc","visits":1}
+    {"utm_medium":"social","visits":1}
+    {"utm_medium":"email","visits":1}

package/core/server/data/tinybird/tests/api_top_utm_sources.yaml

@@ -13,30 +13,6 @@
     {"utm_source":"partner_site","visits":1}
     {"utm_source":"newsletter","visits":1}
 
-- name: Filtered by browser - Chrome
-  description: Filtered by browser - Chrome
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&browser=chrome
-  expected_result: |
-    {"utm_source":"google","visits":1}
-    {"utm_source":"facebook","visits":1}
-    {"utm_source":"bing","visits":1}
-    {"utm_source":"instagram","visits":1}
-    {"utm_source":"partner_site","visits":1}
-
-- name: Filtered by device - desktop
-  description: Filtered by device - desktop
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop
-  expected_result: |
-    {"utm_source":"google","visits":2}
-    {"utm_source":"linkedin","visits":1}
-    {"utm_source":"twitter","visits":1}
-    {"utm_source":"facebook","visits":1}
-    {"utm_source":"bing","visits":1}
-    {"utm_source":"reddit","visits":1}
-    {"utm_source":"instagram","visits":1}
-    {"utm_source":"partner_site","visits":1}
-    {"utm_source":"newsletter","visits":1}
-
 - name: Filtered by location - UK
   description: Filtered by location - UK
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&location=GB
@@ -47,20 +23,6 @@
     {"utm_source":"partner_site","visits":1}
     {"utm_source":"newsletter","visits":1}
 
-- name: Filtered by OS - Windows
-  description: Filtered by OS - Windows
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&os=windows
-  expected_result: |
-    {"utm_source":"google","visits":2}
-    {"utm_source":"linkedin","visits":1}
-    {"utm_source":"twitter","visits":1}
-    {"utm_source":"facebook","visits":1}
-    {"utm_source":"bing","visits":1}
-    {"utm_source":"reddit","visits":1}
-    {"utm_source":"instagram","visits":1}
-    {"utm_source":"partner_site","visits":1}
-    {"utm_source":"newsletter","visits":1}
-
 - name: Filtered by pathname - /about/
   description: Filtered by pathname - /about/
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&pathname=%2Fabout%2F
@@ -120,9 +82,7 @@
 
 - name: Test with multiple filters combined
   description: Test with multiple filters combined
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop&browser=firefox
+  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com&pathname=%2Fabout%2F
   expected_result: |
-    {"utm_source":"linkedin","visits":1}
-    {"utm_source":"twitter","visits":1}
-    {"utm_source":"google","visits":1}
-    {"utm_source":"reddit","visits":1}
+    {"utm_source":"instagram","visits":1}
+    {"utm_source":"newsletter","visits":1}

package/core/server/data/tinybird/tests/api_top_utm_terms.yaml

@@ -11,26 +11,6 @@
     {"utm_term":"new_feature","visits":1}
     {"utm_term":"announcement","visits":1}
 
-- name: Filtered by browser - Chrome
-  description: Filtered by browser - Chrome
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&browser=chrome
-  expected_result: |
-    {"utm_term":"discount","visits":1}
-    {"utm_term":"ghost_blog","visits":1}
-    {"utm_term":"loyal_customers","visits":1}
-
-- name: Filtered by device - desktop
-  description: Filtered by device - desktop
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop
-  expected_result: |
-    {"utm_term":"discount","visits":1}
-    {"utm_term":"ghost_blog","visits":1}
-    {"utm_term":"subscribers","visits":1}
-    {"utm_term":"loyal_customers","visits":1}
-    {"utm_term":"black_friday","visits":1}
-    {"utm_term":"new_feature","visits":1}
-    {"utm_term":"announcement","visits":1}
-
 - name: Filtered by location - UK
   description: Filtered by location - UK
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&location=GB
@@ -40,18 +20,6 @@
     {"utm_term":"subscribers","visits":1}
     {"utm_term":"new_feature","visits":1}
 
-- name: Filtered by OS - Windows
-  description: Filtered by OS - Windows
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&os=windows
-  expected_result: |
-    {"utm_term":"discount","visits":1}
-    {"utm_term":"ghost_blog","visits":1}
-    {"utm_term":"subscribers","visits":1}
-    {"utm_term":"loyal_customers","visits":1}
-    {"utm_term":"black_friday","visits":1}
-    {"utm_term":"new_feature","visits":1}
-    {"utm_term":"announcement","visits":1}
-
 - name: Filtered by pathname - /about/
   description: Filtered by pathname - /about/
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&pathname=%2Fabout%2F
@@ -108,8 +76,7 @@
 
 - name: Test with multiple filters combined
   description: Test with multiple filters combined
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop&browser=firefox
+  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com&pathname=%2Fabout%2F
   expected_result: |
-    {"utm_term":"black_friday","visits":1}
-    {"utm_term":"new_feature","visits":1}
-    {"utm_term":"announcement","visits":1}
+    {"utm_term":"subscribers","visits":1}
+    {"utm_term":"loyal_customers","visits":1}

package/core/server/services/email-address/EmailAddressService.js

@@ -83,9 +83,12 @@ class EmailAddressService {
         if (this.#labs.isSet('domainWarmup') && options.useFallbackAddress) {
             const fallbackEmail = this.fallbackEmail;
             if (fallbackEmail) {
+                if (!fallbackEmail.name) {
+                    fallbackEmail.name = preferred.from.name || this.defaultFromEmail.name;
+                }
                 return {
                     from: fallbackEmail,
-                    replyTo: preferred.replyTo || preferred.from
+                    replyTo: preferred.replyTo || preferred.from || this.defaultFromEmail
                 };
             }
             else {

package/core/server/services/email-address/EmailAddressService.ts

@@ -120,9 +120,13 @@ export class EmailAddressService {
         if (this.#labs.isSet('domainWarmup') && options.useFallbackAddress) {
             const fallbackEmail = this.fallbackEmail;
             if (fallbackEmail) {
+                if (!fallbackEmail.name) {
+                    fallbackEmail.name = preferred.from.name || this.defaultFromEmail.name;
+                }
+
                 return {
                     from: fallbackEmail,
-                    replyTo: preferred.replyTo || preferred.from
+                    replyTo: preferred.replyTo || preferred.from || this.defaultFromEmail
                 };
             } else {
                 logging.error('[EmailAddresses] Fallback email address is not configured, cannot use fallback address for sending email.');

package/core/server/services/email-analytics/EmailAnalyticsService.js

@@ -437,26 +437,55 @@ module.exports = class EmailAnalyticsService {
      * @returns {Promise<void>}
      */
     async processEventBatch(events, result, fetchData) {
-        for (const event of events) {
-            const batchResult = await this.processEvent(event);
+        const useBatchProcessing = this.config.get('emailAnalytics:batchProcessing');
 
-            // Save last event timestamp
-            if (!fetchData.lastEventTimestamp || (event.timestamp && event.timestamp > fetchData.lastEventTimestamp)) {
-                fetchData.lastEventTimestamp = event.timestamp; // don't need to keep db in sync; it'll fall back to last completed timestamp anyways
+        if (useBatchProcessing) {
+            // Batched mode: pre-fetch all recipients, then process events using cache
+            const emailIdentifications = events.map(event => ({
+                emailId: event.emailId,
+                providerId: event.providerId,
+                email: event.recipientEmail
+            }));
+
+            const recipientCache = await this.eventProcessor.batchGetRecipients(emailIdentifications);
+
+            for (const event of events) {
+                const batchResult = await this.processEvent(event, recipientCache);
+
+                // Save last event timestamp
+                if (!fetchData.lastEventTimestamp || (event.timestamp && event.timestamp > fetchData.lastEventTimestamp)) {
+                    fetchData.lastEventTimestamp = event.timestamp;
+                }
+
+                result.merge(batchResult);
             }
 
-            result.merge(batchResult);
+            // Flush all batched updates to the database
+            await this.eventProcessor.flushBatchedUpdates();
+        } else {
+            // Sequential mode: process events one by one (original behavior)
+            for (const event of events) {
+                const batchResult = await this.processEvent(event);
+
+                // Save last event timestamp
+                if (!fetchData.lastEventTimestamp || (event.timestamp && event.timestamp > fetchData.lastEventTimestamp)) {
+                    fetchData.lastEventTimestamp = event.timestamp;
+                }
+
+                result.merge(batchResult);
+            }
         }
     }
 
     /**
      *
      * @param {{id: string, type: any; severity: any; recipientEmail: any; emailId?: string; providerId: string; timestamp: Date; error: {code: number; message: string; enhandedCode: string|number} | null}} event
+     * @param {Map<string, any>} [recipientCache] Optional cache for batched processing
      * @returns {Promise<EventProcessingResult>}
      */
-    async processEvent(event) {
+    async processEvent(event, recipientCache) {
         if (event.type === 'delivered') {
-            const recipient = await this.eventProcessor.handleDelivered({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, event.timestamp);
+            const recipient = await this.eventProcessor.handleDelivered({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, event.timestamp, recipientCache);
 
             if (recipient) {
                 return new EventProcessingResult({
@@ -470,7 +499,7 @@ module.exports = class EmailAnalyticsService {
         }
 
         if (event.type === 'opened') {
-            const recipient = await this.eventProcessor.handleOpened({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, event.timestamp);
+            const recipient = await this.eventProcessor.handleOpened({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, event.timestamp, recipientCache);
 
             if (recipient) {
                 return new EventProcessingResult({
@@ -485,7 +514,7 @@ module.exports = class EmailAnalyticsService {
 
         if (event.type === 'failed') {
             if (event.severity === 'permanent') {
-                const recipient = await this.eventProcessor.handlePermanentFailed({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, {id: event.id, timestamp: event.timestamp, error: event.error});
+                const recipient = await this.eventProcessor.handlePermanentFailed({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, {id: event.id, timestamp: event.timestamp, error: event.error}, recipientCache);
 
                 if (recipient) {
                     return new EventProcessingResult({
@@ -497,7 +526,7 @@ module.exports = class EmailAnalyticsService {
 
                 return new EventProcessingResult({unprocessable: 1});
             } else {
-                const recipient = await this.eventProcessor.handleTemporaryFailed({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, {id: event.id, timestamp: event.timestamp, error: event.error});
+                const recipient = await this.eventProcessor.handleTemporaryFailed({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, {id: event.id, timestamp: event.timestamp, error: event.error}, recipientCache);
 
                 if (recipient) {
                     return new EventProcessingResult({
@@ -512,7 +541,7 @@ module.exports = class EmailAnalyticsService {
         }
 
         if (event.type === 'unsubscribed') {
-            const recipient = await this.eventProcessor.handleUnsubscribed({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, event.timestamp);
+            const recipient = await this.eventProcessor.handleUnsubscribed({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, event.timestamp, recipientCache);
 
             if (recipient) {
                 return new EventProcessingResult({
@@ -526,7 +555,7 @@ module.exports = class EmailAnalyticsService {
         }
 
         if (event.type === 'complained') {
-            const recipient = await this.eventProcessor.handleComplained({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, event.timestamp);
+            const recipient = await this.eventProcessor.handleComplained({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, event.timestamp, recipientCache);
 
             if (recipient) {
                 return new EventProcessingResult({
@@ -547,15 +576,31 @@ module.exports = class EmailAnalyticsService {
      * @param {boolean} includeOpenedEvents
      */
     async aggregateStats({emailIds = [], memberIds = []}, includeOpenedEvents = true) {
+        const useBatchProcessing = this.config.get('emailAnalytics:batchProcessing');
+
         for (const emailId of emailIds) {
             await this.aggregateEmailStats(emailId, includeOpenedEvents);
         }
 
         // @ts-expect-error
         const memberMetric = this.prometheusClient?.getMetric('email_analytics_aggregate_member_stats_count');
-        for (const memberId of memberIds) {
-            await this.aggregateMemberStats(memberId);
-            memberMetric?.inc();
+
+        if (useBatchProcessing) {
+            // Batched mode: process 100 members at a time
+            logging.info(`[EmailAnalytics] Aggregating stats for ${memberIds.length} members using BATCHED mode (batch size: 100)`);
+            const BATCH_SIZE = 100;
+            for (let i = 0; i < memberIds.length; i += BATCH_SIZE) {
+                const batch = memberIds.slice(i, i + BATCH_SIZE);
+                await this.aggregateMemberStatsBatch(batch);
+                memberMetric?.inc(batch.length);
+            }
+        } else {
+            // Sequential mode: process one member at a time
+            logging.info(`[EmailAnalytics] Aggregating stats for ${memberIds.length} members using SEQUENTIAL mode`);
+            for (const memberId of memberIds) {
+                await this.aggregateMemberStats(memberId);
+                memberMetric?.inc();
+            }
         }
     }
 
@@ -577,4 +622,13 @@ module.exports = class EmailAnalyticsService {
     async aggregateMemberStats(memberId) {
         return this.queries.aggregateMemberStats(memberId);
     }
+
+    /**
+     * Aggregate member stats for multiple members in a batch.
+     * @param {string[]} memberIds - Array of member IDs to aggregate stats for.
+     * @returns {Promise<void>}
+     */
+    async aggregateMemberStatsBatch(memberIds) {
+        return this.queries.aggregateMemberStatsBatch(memberIds);
+    }
 };

package/core/server/services/email-analytics/EmailAnalyticsServiceWrapper.js

@@ -57,6 +57,10 @@ class EmailAnalyticsServiceWrapper {
             prometheusClient
         });
 
+        // Log the processing mode on initialization
+        const batchProcessingEnabled = config.get('emailAnalytics:batchProcessing');
+        logging.info(`[EmailAnalytics] Initialized with ${batchProcessingEnabled ? 'BATCHED' : 'SEQUENTIAL'} processing mode`);
+
         // We currently cannot trigger a non-offloaded job from the job manager
         // So the email analytics jobs simply emits an event.
         domainEvents.subscribe(StartEmailAnalyticsJobEvent, async () => {
@@ -81,10 +85,12 @@ class EmailAnalyticsServiceWrapper {
         const apiPercent = totalDurationMs > 0 ? Math.round((apiPollingTimeMs / totalDurationMs) * 100) : 0;
         const processingPercent = totalDurationMs > 0 ? Math.round((processingTimeMs / totalDurationMs) * 100) : 0;
         const aggregationPercent = totalDurationMs > 0 ? Math.round((aggregationTimeMs / totalDurationMs) * 100) : 0;
+        const batchMode = config.get('emailAnalytics:batchProcessing') ? 'BATCHED' : 'SEQUENTIAL';
 
         const logMessage = [
             `[EmailAnalytics] Job complete: ${jobType}`,
             `${eventCount} events in ${(totalDurationMs / 1000).toFixed(1)}s (${throughput.toFixed(2)} events/s)`,
+            `Mode: ${batchMode}`,
             `Timings: API ${(apiPollingTimeMs / 1000).toFixed(1)}s (${apiPercent}%) / Processing ${(processingTimeMs / 1000).toFixed(1)}s (${processingPercent}%) / Aggregation ${(aggregationTimeMs / 1000).toFixed(1)}s (${aggregationPercent}%)`,
             `Events: opened=${result.opened} delivered=${result.delivered} failed=${result.permanentFailed + result.temporaryFailed} unprocessable=${result.unprocessable}`
         ].join(' | ');

package/core/server/services/email-analytics/jobs/update-member-email-analytics/index.js

@@ -1,13 +1,14 @@
 const queries = require('../../lib/queries');
- 
+
 /**
  * Updates email analytics for a specific member
- * 
+ *
  * @param {Object} options - The options object
  * @param {string} options.memberId - The ID of the member to update analytics for
  * @returns {Promise<Object>} The result of the aggregation query (1/0)
  */
 module.exports = async function updateMemberEmailAnalytics({memberId}) {
-    const result = await queries.aggregateMemberStats(memberId);
+    // Use the batch method with a single member for consistency
+    const result = await queries.aggregateMemberStatsBatch([memberId]);
     return result;
 };

package/core/server/services/email-analytics/lib/queries.js

@@ -201,5 +201,89 @@ module.exports = {
         await db.knex('members')
             .update(updateQuery)
             .where('id', memberId);
+    },
+
+    async aggregateMemberStatsBatch(memberIds) {
+        if (!memberIds || memberIds.length === 0) {
+            return;
+        }
+
+        // Batch query to get stats for all members at once
+        const stats = await db.knex('email_recipients')
+            .leftJoin('emails', 'emails.id', 'email_recipients.email_id')
+            .select(
+                'email_recipients.member_id',
+                db.knex.raw('COUNT(email_recipients.id) as email_count'),
+                db.knex.raw('SUM(CASE WHEN email_recipients.opened_at IS NOT NULL THEN 1 ELSE 0 END) as email_opened_count'),
+                db.knex.raw('SUM(CASE WHEN emails.track_opens = 1 THEN 1 ELSE 0 END) as tracked_count')
+            )
+            .whereIn('email_recipients.member_id', memberIds)
+            .groupBy('email_recipients.member_id');
+
+        // Build update data for each member
+        const memberStatsMap = new Map();
+        for (const stat of stats) {
+            const emailOpenRate = stat.tracked_count >= MIN_EMAIL_COUNT_FOR_OPEN_RATE
+                ? Math.round((stat.email_opened_count / stat.tracked_count) * 100)
+                : null;
+
+            memberStatsMap.set(stat.member_id, {
+                email_count: stat.email_count,
+                email_opened_count: stat.email_opened_count,
+                email_open_rate: emailOpenRate
+            });
+        }
+
+        // Build CASE statements for batch update
+        const emailCountCases = [];
+        const emailOpenedCountCases = [];
+        const emailOpenRateCases = [];
+        const emailCountBindings = [];
+        const emailOpenedCountBindings = [];
+        const emailOpenRateBindings = [];
+
+        for (const memberId of memberIds) {
+            const memberStats = memberStatsMap.get(memberId) || {
+                email_count: 0,
+                email_opened_count: 0,
+                email_open_rate: null
+            };
+
+            emailCountCases.push(`WHEN ? THEN ?`);
+            emailCountBindings.push(memberId, memberStats.email_count);
+
+            emailOpenedCountCases.push(`WHEN ? THEN ?`);
+            emailOpenedCountBindings.push(memberId, memberStats.email_opened_count);
+
+            if (memberStats.email_open_rate !== null) {
+                emailOpenRateCases.push(`WHEN ? THEN ?`);
+                emailOpenRateBindings.push(memberId, memberStats.email_open_rate);
+            } else {
+                emailOpenRateCases.push(`WHEN ? THEN NULL`);
+                emailOpenRateBindings.push(memberId);
+            }
+        }
+
+        // Combine bindings in the order they appear in the SQL statement:
+        // 1. All bindings for email_count CASE statement
+        // 2. All bindings for email_opened_count CASE statement
+        // 3. All bindings for email_open_rate CASE statement
+        // 4. Member IDs for the WHERE IN clause
+        const bindings = [
+            ...emailCountBindings,
+            ...emailOpenedCountBindings,
+            ...emailOpenRateBindings,
+            ...memberIds
+        ];
+
+        // Execute batched update with CASE statements
+        await db.knex.raw(`
+            UPDATE members
+            SET
+                email_count = CASE id ${emailCountCases.join(' ')} END,
+                email_opened_count = CASE id ${emailOpenedCountCases.join(' ')} END,
+                email_open_rate = CASE id ${emailOpenRateCases.join(' ')} END
+            WHERE id IN (${memberIds.map(() => '?').join(',')})
+        `, bindings);
     }
 };