From f0b87216f7077cbcbad1ab99d29b76bcceafa29e Mon Sep 17 00:00:00 2001
From: Simon Backx <simon@ghost.org>
Date: Fri, 11 Nov 2022 09:56:03 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20visible=20canceled=20eve?=
 =?UTF-8?q?nts=20in=20conversions=20tab=20on=20analytics=20page=20(#15796)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fixes https://github.com/TryGhost/Team/issues/2238

**Issue**
When viewing the 'conversions' tab on the analytics page, you could
sometimes see more listed events than the total number of conversions.
This is because other subscription events are also shown in the list.
E.g., if a new member became a paid subscriber that is attributed to a
given post, and later that subscrption has been canceled, that canceled
event would also be shown on the analytics page. This isn't really
desirable.

**Fix**
Now only 'created' subscription events are shown when the activity feed
is filtered by post_id. The other subtypes aren't related to that given
post and should be excluded.
---
 ghost/members-api/lib/repositories/event.js | 70 +--------------------
 1 file changed, 1 insertion(+), 69 deletions(-)

diff --git a/ghost/members-api/lib/repositories/event.js b/ghost/members-api/lib/repositories/event.js
index fae6b7d449..568b17ecbc 100644
--- a/ghost/members-api/lib/repositories/event.js
+++ b/ghost/members-api/lib/repositories/event.js
@@ -170,38 +170,6 @@ module.exports = class EventRepository {
     }
 
     async getSubscriptionEvents(options = {}, filter) {
-        if (!this._labsService.isSet('memberAttribution')){
-            options = {
-                ...options,
-                withRelated: ['member'],
-                filter: 'custom:true',
-                mongoTransformer: chainTransformers(
-                    // First set the filter manually
-                    replaceCustomFilterTransformer(filter),
-    
-                    // Map the used keys in that filter
-                    ...mapKeys({
-                        'data.created_at': 'created_at',
-                        'data.member_id': 'member_id'
-                    })
-                )
-            };
-    
-            const {data: models, meta} = await this._MemberPaidSubscriptionEvent.findPage(options);
-    
-            const data = models.map((model) => {
-                return {
-                    type: 'subscription_event',
-                    data: model.toJSON(options)
-                };
-            });
-    
-            return {
-                data,
-                meta
-            };
-        }
-
         options = {
             ...options,
             withRelated: [
@@ -230,7 +198,7 @@ module.exports = class EventRepository {
                     return expandFilters(f, [{
                         key: 'data.post_id',
                         replacement: 'subscriptionCreatedEvent.attribution_id',
-                        expansion: {'subscriptionCreatedEvent.attribution_type': 'post'}
+                        expansion: {'subscriptionCreatedEvent.attribution_type': 'post', type: 'created'}
                     }]);
                 }
             )
@@ -327,42 +295,6 @@ module.exports = class EventRepository {
     }
 
     async getSignupEvents(options = {}, filter) {
-        if (!this._labsService.isSet('memberAttribution')){
-            options = {
-                ...options,
-                withRelated: ['member'],
-                filter: 'from_status:null+custom:true',
-                mongoTransformer: chainTransformers(
-                    // First set the filter manually
-                    replaceCustomFilterTransformer(filter),
-    
-                    // Map the used keys in that filter
-                    ...mapKeys({
-                        'data.created_at': 'created_at',
-                        'data.member_id': 'member_id'
-                    })
-                )
-            };
-    
-            const {data: models, meta} = await this._MemberStatusEvent.findPage(options);
-    
-            const data = models.map((model) => {
-                return {
-                    type: 'signup_event',
-                    data: model.toJSON(options)
-                };
-            });
-    
-            return {
-                data,
-                meta
-            };
-        }
-
-        return this.getCreatedEvents(options, filter);
-    }
-
-    async getCreatedEvents(options = {}, filter) {
         options = {
             ...options,
             withRelated: [