chore(release): publish new version

- @standardnotes/analytics@1.49.0
 - @standardnotes/api-gateway@1.36.11
 - @standardnotes/auth-server@1.50.0
 - @standardnotes/domain-events-infra@1.9.10
 - @standardnotes/domain-events@2.76.0
 - @standardnotes/event-store@1.6.5
 - @standardnotes/files-server@1.8.5
 - @standardnotes/scheduler-server@1.13.6
 - @standardnotes/syncing-server@1.10.22
 - @standardnotes/websockets-server@1.4.5
 - @standardnotes/workspace-server@1.17.5

packages/analytics/CHANGELOG.md

@@ -3,6 +3,68 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.49.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.48.0...@standardnotes/analytics@1.49.0) (2022-11-07)
+
+### Features
+
+* **analytics:** add handling subscription refunded event ([197c991](https://github.com/standardnotes/server/commit/197c9914caf8fb31ce3ee69d05381d2a6416b366))
+
+# [1.48.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.47.0...@standardnotes/analytics@1.48.0) (2022-11-07)
+
+### Features
+
+* **analytics:** add subscription renewed event handler ([2aa57f1](https://github.com/standardnotes/server/commit/2aa57f1f0ddace741b79e9375b87464eaaba6320))
+
+# [1.47.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.46.0...@standardnotes/analytics@1.47.0) (2022-11-04)
+
+### Features
+
+* **analytics:** add subscription cancelled event handler ([037fb23](https://github.com/standardnotes/server/commit/037fb2398ae9aaa11682e1a8576bab28c69e0f9b))
+
+# [1.46.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.45.0...@standardnotes/analytics@1.46.0) (2022-11-04)
+
+### Features
+
+* **analytics:** add payment success event handler ([5902cbb](https://github.com/standardnotes/server/commit/5902cbb6218a5b3982b4c56f8d6644f4f5bc6d32))
+
+# [1.45.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.44.0...@standardnotes/analytics@1.45.0) (2022-11-04)
+
+### Features
+
+* add payment failed handler and email to analytics entity ([51b12d0](https://github.com/standardnotes/server/commit/51b12d05d49868db1d61313c4d8b3829994e7eb3))
+
+# [1.44.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.43.0...@standardnotes/analytics@1.44.0) (2022-11-04)
+
+### Features
+
+* **analytics:** removing analytics entity upon account deletion ([2720a7c](https://github.com/standardnotes/server/commit/2720a7c827a6352cb5254e88d42d45c385921448))
+
+# [1.43.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.42.0...@standardnotes/analytics@1.43.0) (2022-11-04)
+
+### Features
+
+* **analytics:** add account deletion event handler ([5383e0c](https://github.com/standardnotes/server/commit/5383e0cf525ddd203beee451f1cfd5fd8600b522))
+
+# [1.42.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.41.0...@standardnotes/analytics@1.42.0) (2022-11-04)
+
+### Bug Fixes
+
+* **analytics:** imports ([35611fb](https://github.com/standardnotes/server/commit/35611fbc07e50efbba954d7c96db9917e0dddd7d))
+
+### Features
+
+* **analytics:** add user registered handler ([034aa38](https://github.com/standardnotes/server/commit/034aa381539cf4b46769cfd1646dec2051d836c3))
+
+# [1.41.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.40.0...@standardnotes/analytics@1.41.0) (2022-11-04)
+
+### Bug Fixes
+
+* **analytics:** linter setup with migrations ([262d295](https://github.com/standardnotes/server/commit/262d2951218753f6f14613c5d8ae20ade0e4ef06))
+
+### Features
+
+* **analytics:** add retrieving user analytics id ([4e5ac0a](https://github.com/standardnotes/server/commit/4e5ac0a47b469e5fa681f0131d04c9823cebedf3))
+
 # [1.40.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.39.1...@standardnotes/analytics@1.40.0) (2022-11-04)
 
 ### Features

packages/analytics/migrations/1667568051894-add_email_to_analytics_entity.ts

@@ -0,0 +1,15 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class addEmailToAnalyticsEntity1667568051894 implements MigrationInterface {
+  name = 'addEmailToAnalyticsEntity1667568051894'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('ALTER TABLE `analytics_entities` ADD `user_email` varchar(255) NULL')
+    await queryRunner.query('CREATE INDEX `email` ON `analytics_entities` (`user_email`)')
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DROP INDEX `email` ON `analytics_entities`')
+    await queryRunner.query('ALTER TABLE `analytics_entities` DROP COLUMN `user_email`')
+  }
+}

packages/analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/analytics",
-  "version": "1.40.0",
+  "version": "1.49.0",
   "engines": {
     "node": ">=14.0.0 <17.0.0"
   },

packages/analytics/src/Bootstrap/Container.ts

@@ -32,6 +32,14 @@ import { AnalyticsEntityRepositoryInterface } from '../Domain/Entity/AnalyticsEn
 import { MySQLAnalyticsEntityRepository } from '../Infra/MySQL/MySQLAnalyticsEntityRepository'
 import { Repository } from 'typeorm'
 import { AnalyticsEntity } from '../Domain/Entity/AnalyticsEntity'
+import { GetUserAnalyticsId } from '../Domain/UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+import { UserRegisteredEventHandler } from '../Domain/Handler/UserRegisteredEventHandler'
+import { AccountDeletionRequestedEventHandler } from '../Domain/Handler/AccountDeletionRequestedEventHandler'
+import { PaymentFailedEventHandler } from '../Domain/Handler/PaymentFailedEventHandler'
+import { PaymentSuccessEventHandler } from '../Domain/Handler/PaymentSuccessEventHandler'
+import { SubscriptionCancelledEventHandler } from '../Domain/Handler/SubscriptionCancelledEventHandler'
+import { SubscriptionRenewedEventHandler } from '../Domain/Handler/SubscriptionRenewedEventHandler'
+import { SubscriptionRefundedEventHandler } from '../Domain/Handler/SubscriptionRefundedEventHandler'
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const newrelicFormatter = require('@newrelic/winston-enricher')
@@ -111,8 +119,24 @@ export class ContainerConfigLoader {
       .toConstantValue(AppDataSource.getRepository(AnalyticsEntity))
 
     // Use Case
+    container.bind<GetUserAnalyticsId>(TYPES.GetUserAnalyticsId).to(GetUserAnalyticsId)
 
     // Hanlders
+    container.bind<UserRegisteredEventHandler>(TYPES.UserRegisteredEventHandler).to(UserRegisteredEventHandler)
+    container
+      .bind<AccountDeletionRequestedEventHandler>(TYPES.AccountDeletionRequestedEventHandler)
+      .to(AccountDeletionRequestedEventHandler)
+    container.bind<PaymentFailedEventHandler>(TYPES.PaymentFailedEventHandler).to(PaymentFailedEventHandler)
+    container.bind<PaymentSuccessEventHandler>(TYPES.PaymentSuccessEventHandler).to(PaymentSuccessEventHandler)
+    container
+      .bind<SubscriptionCancelledEventHandler>(TYPES.SubscriptionCancelledEventHandler)
+      .to(SubscriptionCancelledEventHandler)
+    container
+      .bind<SubscriptionRenewedEventHandler>(TYPES.SubscriptionRenewedEventHandler)
+      .to(SubscriptionRenewedEventHandler)
+    container
+      .bind<SubscriptionRefundedEventHandler>(TYPES.SubscriptionRefundedEventHandler)
+      .to(SubscriptionRefundedEventHandler)
 
     // Services
     container.bind<DomainEventFactory>(TYPES.DomainEventFactory).to(DomainEventFactory)
@@ -137,7 +161,9 @@ export class ContainerConfigLoader {
         )
     }
 
-    const eventHandlers: Map<string, DomainEventHandlerInterface> = new Map([])
+    const eventHandlers: Map<string, DomainEventHandlerInterface> = new Map([
+      ['USER_REGISTERED', container.get(TYPES.UserRegisteredEventHandler)],
+    ])
 
     if (env.get('SQS_QUEUE_URL', true)) {
       container

packages/analytics/src/Bootstrap/Types.ts

@@ -16,7 +16,15 @@ const TYPES = {
   // ORM
   ORMAnalyticsEntityRepository: Symbol.for('ORMAnalyticsEntityRepository'),
   // Use Case
+  GetUserAnalyticsId: Symbol.for('GetUserAnalyticsId'),
   // Handlers
+  UserRegisteredEventHandler: Symbol.for('UserRegisteredEventHandler'),
+  AccountDeletionRequestedEventHandler: Symbol.for('AccountDeletionRequestedEventHandler'),
+  PaymentFailedEventHandler: Symbol.for('PaymentFailedEventHandler'),
+  PaymentSuccessEventHandler: Symbol.for('PaymentSuccessEventHandler'),
+  SubscriptionCancelledEventHandler: Symbol.for('SubscriptionCancelledEventHandler'),
+  SubscriptionRenewedEventHandler: Symbol.for('SubscriptionRenewedEventHandler'),
+  SubscriptionRefundedEventHandler: Symbol.for('SubscriptionRefundedEventHandler'),
   // Services
   DomainEventPublisher: Symbol.for('DomainEventPublisher'),
   DomainEventSubscriberFactory: Symbol.for('DomainEventSubscriberFactory'),

packages/analytics/src/Domain/Entity/AnalyticsEntity.ts

@@ -11,4 +11,12 @@ export class AnalyticsEntity {
   })
   @Index('user_uuid')
   declare userUuid: string
+
+  @Column({
+    name: 'user_email',
+    length: 255,
+    nullable: true,
+  })
+  @Index('email')
+  declare userEmail: string
 }

packages/analytics/src/Domain/Entity/AnalyticsEntityRepositoryInterface.ts

@@ -3,5 +3,7 @@ import { AnalyticsEntity } from './AnalyticsEntity'
 
 export interface AnalyticsEntityRepositoryInterface {
   save(analyticsEntity: AnalyticsEntity): Promise<AnalyticsEntity>
+  remove(analyticsEntity: AnalyticsEntity): Promise<void>
   findOneByUserUuid(userUuid: Uuid): Promise<AnalyticsEntity | null>
+  findOneByUserEmail(email: string): Promise<AnalyticsEntity | null>
 }

packages/analytics/src/Domain/Handler/AccountDeletionRequestedEventHandler.spec.ts

@@ -0,0 +1,69 @@
+import 'reflect-metadata'
+
+import { AccountDeletionRequestedEvent } from '@standardnotes/domain-events'
+import { AccountDeletionRequestedEventHandler } from './AccountDeletionRequestedEventHandler'
+import { TimerInterface } from '@standardnotes/time'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
+import { Period } from '../Time/Period'
+import { AnalyticsEntityRepositoryInterface } from '../Entity/AnalyticsEntityRepositoryInterface'
+
+describe('AccountDeletionRequestedEventHandler', () => {
+  let event: AccountDeletionRequestedEvent
+  let analyticsEntityRepository: AnalyticsEntityRepositoryInterface
+  let analyticsStore: AnalyticsStoreInterface
+  let statisticsStore: StatisticsStoreInterface
+  let timer: TimerInterface
+
+  const createHandler = () =>
+    new AccountDeletionRequestedEventHandler(analyticsEntityRepository, analyticsStore, statisticsStore, timer)
+
+  beforeEach(() => {
+    event = {} as jest.Mocked<AccountDeletionRequestedEvent>
+    event.createdAt = new Date(1)
+    event.payload = {
+      userUuid: '1-2-3',
+      userCreatedAtTimestamp: 1,
+      regularSubscriptionUuid: '2-3-4',
+    }
+
+    analyticsEntityRepository = {} as jest.Mocked<AnalyticsEntityRepositoryInterface>
+    analyticsEntityRepository.findOneByUserUuid = jest.fn().mockReturnValue({ id: 3 })
+    analyticsEntityRepository.remove = jest.fn()
+
+    analyticsStore = {} as jest.Mocked<AnalyticsStoreInterface>
+    analyticsStore.markActivity = jest.fn()
+
+    statisticsStore = {} as jest.Mocked<StatisticsStoreInterface>
+    statisticsStore.incrementMeasure = jest.fn()
+
+    timer = {} as jest.Mocked<TimerInterface>
+    timer.getTimestampInMicroseconds = jest.fn().mockReturnValue(123)
+  })
+
+  it('should mark account deletion and registration length', async () => {
+    await createHandler().handle(event)
+
+    expect(analyticsStore.markActivity).toHaveBeenCalledWith(['DeleteAccount'], 3, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+    expect(statisticsStore.incrementMeasure).toHaveBeenCalledWith('registration-length', 122, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+    expect(analyticsEntityRepository.remove).toHaveBeenCalled()
+  })
+
+  it('should not mark anything if entity is not found', async () => {
+    analyticsEntityRepository.findOneByUserUuid = jest.fn().mockReturnValue(null)
+
+    await createHandler().handle(event)
+
+    expect(analyticsStore.markActivity).not.toHaveBeenCalled()
+    expect(statisticsStore.incrementMeasure).not.toHaveBeenCalled()
+    expect(analyticsEntityRepository.remove).not.toHaveBeenCalled()
+  })
+})

packages/analytics/src/Domain/Handler/AccountDeletionRequestedEventHandler.ts

@@ -0,0 +1,44 @@
+import { AccountDeletionRequestedEvent, DomainEventHandlerInterface } from '@standardnotes/domain-events'
+import { TimerInterface } from '@standardnotes/time'
+import { inject, injectable } from 'inversify'
+
+import TYPES from '../../Bootstrap/Types'
+import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { AnalyticsEntityRepositoryInterface } from '../Entity/AnalyticsEntityRepositoryInterface'
+import { StatisticsMeasure } from '../Statistics/StatisticsMeasure'
+import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
+import { Period } from '../Time/Period'
+
+@injectable()
+export class AccountDeletionRequestedEventHandler implements DomainEventHandlerInterface {
+  constructor(
+    @inject(TYPES.AnalyticsEntityRepository) private analyticsEntityRepository: AnalyticsEntityRepositoryInterface,
+    @inject(TYPES.AnalyticsStore) private analyticsStore: AnalyticsStoreInterface,
+    @inject(TYPES.StatisticsStore) private statisticsStore: StatisticsStoreInterface,
+    @inject(TYPES.Timer) private timer: TimerInterface,
+  ) {}
+
+  async handle(event: AccountDeletionRequestedEvent): Promise<void> {
+    const analyticsEntity = await this.analyticsEntityRepository.findOneByUserUuid(event.payload.userUuid)
+
+    if (analyticsEntity === null) {
+      return
+    }
+
+    await this.analyticsStore.markActivity([AnalyticsActivity.DeleteAccount], analyticsEntity.id, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+
+    const registrationLength = this.timer.getTimestampInMicroseconds() - event.payload.userCreatedAtTimestamp
+    await this.statisticsStore.incrementMeasure(StatisticsMeasure.RegistrationLength, registrationLength, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+
+    await this.analyticsEntityRepository.remove(analyticsEntity)
+  }
+}

packages/analytics/src/Domain/Handler/PaymentFailedEventHandler.spec.ts

@@ -0,0 +1,34 @@
+import 'reflect-metadata'
+
+import { PaymentFailedEvent } from '@standardnotes/domain-events'
+
+import { PaymentFailedEventHandler } from './PaymentFailedEventHandler'
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+
+describe('PaymentFailedEventHandler', () => {
+  let event: PaymentFailedEvent
+  let getUserAnalyticsId: GetUserAnalyticsId
+  let analyticsStore: AnalyticsStoreInterface
+
+  const createHandler = () => new PaymentFailedEventHandler(getUserAnalyticsId, analyticsStore)
+
+  beforeEach(() => {
+    getUserAnalyticsId = {} as jest.Mocked<GetUserAnalyticsId>
+    getUserAnalyticsId.execute = jest.fn().mockReturnValue({ analyticsId: 3 })
+
+    analyticsStore = {} as jest.Mocked<AnalyticsStoreInterface>
+    analyticsStore.markActivity = jest.fn()
+
+    event = {} as jest.Mocked<PaymentFailedEvent>
+    event.payload = {
+      userEmail: 'test@test.com',
+    }
+  })
+
+  it('should mark payment failed for analytics', async () => {
+    await createHandler().handle(event)
+
+    expect(analyticsStore.markActivity).toHaveBeenCalled()
+  })
+})

packages/analytics/src/Domain/Handler/PaymentFailedEventHandler.ts

@@ -0,0 +1,25 @@
+import { DomainEventHandlerInterface, PaymentFailedEvent } from '@standardnotes/domain-events'
+import { inject, injectable } from 'inversify'
+
+import TYPES from '../../Bootstrap/Types'
+import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { Period } from '../Time/Period'
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+
+@injectable()
+export class PaymentFailedEventHandler implements DomainEventHandlerInterface {
+  constructor(
+    @inject(TYPES.GetUserAnalyticsId) private getUserAnalyticsId: GetUserAnalyticsId,
+    @inject(TYPES.AnalyticsStore) private analyticsStore: AnalyticsStoreInterface,
+  ) {}
+
+  async handle(event: PaymentFailedEvent): Promise<void> {
+    const { analyticsId } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    await this.analyticsStore.markActivity([AnalyticsActivity.PaymentFailed], analyticsId, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+  }
+}

packages/analytics/src/Domain/Handler/PaymentSuccessEventHandler.spec.ts

@@ -0,0 +1,75 @@
+import 'reflect-metadata'
+
+import { PaymentSuccessEvent } from '@standardnotes/domain-events'
+
+import { PaymentSuccessEventHandler } from './PaymentSuccessEventHandler'
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+import { Logger } from 'winston'
+import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { Period } from '../Time/Period'
+
+describe('PaymentSuccessEventHandler', () => {
+  let event: PaymentSuccessEvent
+  let getUserAnalyticsId: GetUserAnalyticsId
+  let analyticsStore: AnalyticsStoreInterface
+  let statisticsStore: StatisticsStoreInterface
+  let logger: Logger
+
+  const createHandler = () =>
+    new PaymentSuccessEventHandler(getUserAnalyticsId, analyticsStore, statisticsStore, logger)
+
+  beforeEach(() => {
+    getUserAnalyticsId = {} as jest.Mocked<GetUserAnalyticsId>
+    getUserAnalyticsId.execute = jest.fn().mockReturnValue({ analyticsId: 3 })
+
+    analyticsStore = {} as jest.Mocked<AnalyticsStoreInterface>
+    analyticsStore.markActivity = jest.fn()
+
+    statisticsStore = {} as jest.Mocked<StatisticsStoreInterface>
+    statisticsStore.incrementMeasure = jest.fn()
+
+    event = {} as jest.Mocked<PaymentSuccessEvent>
+    event.payload = {
+      userEmail: 'test@test.com',
+      amount: 12.45,
+      billingFrequency: 12,
+      paymentType: 'initial',
+      subscriptionName: 'PRO_PLAN',
+    }
+
+    logger = {} as jest.Mocked<Logger>
+    logger.warn = jest.fn()
+  })
+
+  it('should mark payment success for analytics', async () => {
+    await createHandler().handle(event)
+
+    expect(analyticsStore.markActivity).toHaveBeenCalled()
+    expect(statisticsStore.incrementMeasure).toHaveBeenNthCalledWith(
+      2,
+      'pro-subscription-initial-annual-payments-income',
+      12.45,
+      [Period.Today, Period.ThisWeek, Period.ThisMonth],
+    )
+  })
+
+  it('should mark non-detailed payment success statistics for analytics', async () => {
+    event.payload = {
+      userEmail: 'test@test.com',
+      amount: 12.45,
+      billingFrequency: 13,
+      paymentType: 'initial',
+      subscriptionName: 'PRO_PLAN',
+    }
+
+    await createHandler().handle(event)
+
+    expect(statisticsStore.incrementMeasure).toBeCalledTimes(1)
+    expect(statisticsStore.incrementMeasure).toHaveBeenNthCalledWith(1, 'income', 12.45, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+  })
+})

packages/analytics/src/Domain/Handler/PaymentSuccessEventHandler.ts

@@ -0,0 +1,93 @@
+import { PaymentType, SubscriptionBillingFrequency, SubscriptionName } from '@standardnotes/common'
+import { DomainEventHandlerInterface, PaymentSuccessEvent } from '@standardnotes/domain-events'
+import { inject, injectable } from 'inversify'
+import { Logger } from 'winston'
+
+import TYPES from '../../Bootstrap/Types'
+import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { StatisticsMeasure } from '../Statistics/StatisticsMeasure'
+import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
+import { Period } from '../Time/Period'
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+
+@injectable()
+export class PaymentSuccessEventHandler implements DomainEventHandlerInterface {
+  private readonly DETAILED_MEASURES = new Map([
+    [
+      SubscriptionName.PlusPlan,
+      new Map([
+        [
+          PaymentType.Initial,
+          new Map([
+            [SubscriptionBillingFrequency.Monthly, StatisticsMeasure.PlusSubscriptionInitialMonthlyPaymentsIncome],
+            [SubscriptionBillingFrequency.Annual, StatisticsMeasure.PlusSubscriptionInitialAnnualPaymentsIncome],
+          ]),
+        ],
+        [
+          PaymentType.Renewal,
+          new Map([
+            [SubscriptionBillingFrequency.Monthly, StatisticsMeasure.PlusSubscriptionRenewingMonthlyPaymentsIncome],
+            [SubscriptionBillingFrequency.Annual, StatisticsMeasure.PlusSubscriptionRenewingAnnualPaymentsIncome],
+          ]),
+        ],
+      ]),
+    ],
+    [
+      SubscriptionName.ProPlan,
+      new Map([
+        [
+          PaymentType.Initial,
+          new Map([
+            [SubscriptionBillingFrequency.Monthly, StatisticsMeasure.ProSubscriptionInitialMonthlyPaymentsIncome],
+            [SubscriptionBillingFrequency.Annual, StatisticsMeasure.ProSubscriptionInitialAnnualPaymentsIncome],
+          ]),
+        ],
+        [
+          PaymentType.Renewal,
+          new Map([
+            [SubscriptionBillingFrequency.Monthly, StatisticsMeasure.ProSubscriptionRenewingMonthlyPaymentsIncome],
+            [SubscriptionBillingFrequency.Annual, StatisticsMeasure.ProSubscriptionRenewingAnnualPaymentsIncome],
+          ]),
+        ],
+      ]),
+    ],
+  ])
+
+  constructor(
+    @inject(TYPES.GetUserAnalyticsId) private getUserAnalyticsId: GetUserAnalyticsId,
+    @inject(TYPES.AnalyticsStore) private analyticsStore: AnalyticsStoreInterface,
+    @inject(TYPES.StatisticsStore) private statisticsStore: StatisticsStoreInterface,
+    @inject(TYPES.Logger) private logger: Logger,
+  ) {}
+
+  async handle(event: PaymentSuccessEvent): Promise<void> {
+    const { analyticsId } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    await this.analyticsStore.markActivity([AnalyticsActivity.PaymentSuccess], analyticsId, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+
+    const statisticMeasures = [StatisticsMeasure.Income]
+
+    const detailedMeasure = this.DETAILED_MEASURES.get(event.payload.subscriptionName as SubscriptionName)
+      ?.get(event.payload.paymentType as PaymentType)
+      ?.get(event.payload.billingFrequency as SubscriptionBillingFrequency)
+    if (detailedMeasure !== undefined) {
+      statisticMeasures.push(detailedMeasure)
+    } else {
+      this.logger.warn(
+        `Could not find detailed measure for: subscription - ${event.payload.subscriptionName}, payment type - ${event.payload.paymentType}, billing frequency - ${event.payload.billingFrequency}`,
+      )
+    }
+
+    for (const measure of statisticMeasures) {
+      await this.statisticsStore.incrementMeasure(measure, event.payload.amount, [
+        Period.Today,
+        Period.ThisWeek,
+        Period.ThisMonth,
+      ])
+    }
+  }
+}

packages/analytics/src/Domain/Handler/SubscriptionCancelledEventHandler.spec.ts

@@ -0,0 +1,69 @@
+import 'reflect-metadata'
+
+import { SubscriptionName } from '@standardnotes/common'
+import { SubscriptionCancelledEvent } from '@standardnotes/domain-events'
+
+import { SubscriptionCancelledEventHandler } from './SubscriptionCancelledEventHandler'
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { StatisticsMeasure } from '../Statistics/StatisticsMeasure'
+import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
+import { Period } from '../Time/Period'
+
+describe('SubscriptionCancelledEventHandler', () => {
+  let event: SubscriptionCancelledEvent
+  let getUserAnalyticsId: GetUserAnalyticsId
+  let analyticsStore: AnalyticsStoreInterface
+  let statisticsStore: StatisticsStoreInterface
+
+  const createHandler = () => new SubscriptionCancelledEventHandler(getUserAnalyticsId, analyticsStore, statisticsStore)
+
+  beforeEach(() => {
+    getUserAnalyticsId = {} as jest.Mocked<GetUserAnalyticsId>
+    getUserAnalyticsId.execute = jest.fn().mockReturnValue({ analyticsId: 3 })
+
+    analyticsStore = {} as jest.Mocked<AnalyticsStoreInterface>
+    analyticsStore.markActivity = jest.fn()
+
+    statisticsStore = {} as jest.Mocked<StatisticsStoreInterface>
+    statisticsStore.incrementMeasure = jest.fn()
+
+    event = {} as jest.Mocked<SubscriptionCancelledEvent>
+    event.createdAt = new Date(1)
+    event.payload = {
+      subscriptionId: 1,
+      userEmail: 'test@test.com',
+      subscriptionName: SubscriptionName.ProPlan,
+      subscriptionCreatedAt: 1642395451515000,
+      subscriptionUpdatedAt: 1642395451515001,
+      lastPayedAt: 1642395451515001,
+      subscriptionEndsAt: 1642395451515000 + 10,
+      timestamp: 1,
+      offline: false,
+      replaced: false,
+    }
+  })
+
+  it('should track subscription cancelled statistics', async () => {
+    event.payload.timestamp = 1642395451516000
+
+    await createHandler().handle(event)
+
+    expect(analyticsStore.markActivity).toHaveBeenCalled()
+    expect(statisticsStore.incrementMeasure).toHaveBeenCalledWith(StatisticsMeasure.SubscriptionLength, 1000, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+  })
+
+  it('should not track statistics for subscriptions that are in a legacy 5 year plan', async () => {
+    event.payload.timestamp = 1642395451516000
+    event.payload.subscriptionEndsAt = 1642395451515000 + 126_230_400_000_001
+    event.payload.subscriptionCreatedAt = 1642395451515000
+
+    await createHandler().handle(event)
+
+    expect(statisticsStore.incrementMeasure).not.toHaveBeenCalled()
+  })
+})

packages/analytics/src/Domain/Handler/SubscriptionCancelledEventHandler.ts

@@ -0,0 +1,60 @@
+import { DomainEventHandlerInterface, SubscriptionCancelledEvent } from '@standardnotes/domain-events'
+import { inject, injectable } from 'inversify'
+
+import TYPES from '../../Bootstrap/Types'
+import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { StatisticsMeasure } from '../Statistics/StatisticsMeasure'
+import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
+import { Period } from '../Time/Period'
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+
+@injectable()
+export class SubscriptionCancelledEventHandler implements DomainEventHandlerInterface {
+  constructor(
+    @inject(TYPES.GetUserAnalyticsId) private getUserAnalyticsId: GetUserAnalyticsId,
+    @inject(TYPES.AnalyticsStore) private analyticsStore: AnalyticsStoreInterface,
+    @inject(TYPES.StatisticsStore) private statisticsStore: StatisticsStoreInterface,
+  ) {}
+
+  async handle(event: SubscriptionCancelledEvent): Promise<void> {
+    const { analyticsId } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    await this.analyticsStore.markActivity([AnalyticsActivity.SubscriptionCancelled], analyticsId, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+
+    await this.trackSubscriptionStatistics(event)
+  }
+
+  private async trackSubscriptionStatistics(event: SubscriptionCancelledEvent) {
+    if (this.isLegacy5yearSubscriptionPlan(event.payload.subscriptionEndsAt, event.payload.subscriptionCreatedAt)) {
+      return
+    }
+
+    const subscriptionLength = event.payload.timestamp - event.payload.subscriptionCreatedAt
+    await this.statisticsStore.incrementMeasure(StatisticsMeasure.SubscriptionLength, subscriptionLength, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+
+    const remainingSubscriptionTime = event.payload.subscriptionEndsAt - event.payload.timestamp
+    const totalSubscriptionTime = event.payload.subscriptionEndsAt - event.payload.lastPayedAt
+
+    const remainingSubscriptionPercentage = Math.floor((remainingSubscriptionTime / totalSubscriptionTime) * 100)
+
+    await this.statisticsStore.incrementMeasure(
+      StatisticsMeasure.RemainingSubscriptionTimePercentage,
+      remainingSubscriptionPercentage,
+      [Period.Today, Period.ThisWeek, Period.ThisMonth],
+    )
+  }
+
+  private isLegacy5yearSubscriptionPlan(subscriptionEndsAt: number, subscriptionCreatedAt: number) {
+    const fourYearsInMicroseconds = 126_230_400_000_000
+
+    return subscriptionEndsAt - subscriptionCreatedAt > fourYearsInMicroseconds
+  }
+}

packages/analytics/src/Domain/Handler/SubscriptionRefundedEventHandler.spec.ts

@@ -0,0 +1,78 @@
+import 'reflect-metadata'
+
+import { SubscriptionName } from '@standardnotes/common'
+import { SubscriptionRefundedEvent } from '@standardnotes/domain-events'
+
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+
+import { SubscriptionRefundedEventHandler } from './SubscriptionRefundedEventHandler'
+import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
+import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
+import { Period } from '../Time/Period'
+
+describe('SubscriptionRefundedEventHandler', () => {
+  let event: SubscriptionRefundedEvent
+  let getUserAnalyticsId: GetUserAnalyticsId
+  let analyticsStore: AnalyticsStoreInterface
+  let statisticsStore: StatisticsStoreInterface
+
+  const createHandler = () => new SubscriptionRefundedEventHandler(getUserAnalyticsId, analyticsStore, statisticsStore)
+
+  beforeEach(() => {
+    event = {} as jest.Mocked<SubscriptionRefundedEvent>
+    event.createdAt = new Date(1)
+    event.payload = {
+      subscriptionId: 1,
+      userEmail: 'test@test.com',
+      subscriptionName: SubscriptionName.PlusPlan,
+      timestamp: 1,
+      offline: false,
+      userExistingSubscriptionsCount: 3,
+      totalActiveSubscriptionsCount: 1,
+    }
+
+    getUserAnalyticsId = {} as jest.Mocked<GetUserAnalyticsId>
+    getUserAnalyticsId.execute = jest.fn().mockReturnValue({ analyticsId: 3 })
+
+    analyticsStore = {} as jest.Mocked<AnalyticsStoreInterface>
+    analyticsStore.markActivity = jest.fn()
+    analyticsStore.wasActivityDone = jest.fn().mockReturnValue(true)
+
+    statisticsStore = {} as jest.Mocked<StatisticsStoreInterface>
+    statisticsStore.setMeasure = jest.fn()
+  })
+
+  it('should mark churn for new customer', async () => {
+    event.payload.userExistingSubscriptionsCount = 1
+    await createHandler().handle(event)
+
+    expect(analyticsStore.markActivity).toHaveBeenCalledWith([AnalyticsActivity.SubscriptionRefunded], 3, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+
+    expect(analyticsStore.markActivity).toHaveBeenCalledWith([AnalyticsActivity.NewCustomersChurn], 3, [
+      Period.ThisMonth,
+    ])
+  })
+
+  it('should mark churn for existing customer', async () => {
+    await createHandler().handle(event)
+
+    expect(analyticsStore.markActivity).toHaveBeenCalledWith([AnalyticsActivity.ExistingCustomersChurn], 3, [
+      Period.ThisMonth,
+    ])
+  })
+
+  it('should not mark churn if customer did not purchase subscription in defined analytic periods', async () => {
+    analyticsStore.wasActivityDone = jest.fn().mockReturnValue(false)
+
+    await createHandler().handle(event)
+
+    expect(analyticsStore.markActivity).not.toHaveBeenCalledWith([AnalyticsActivity.ExistingCustomersChurn], 3, [
+      Period.ThisMonth,
+    ])
+  })
+})

packages/analytics/src/Domain/Handler/SubscriptionRefundedEventHandler.ts

@@ -0,0 +1,54 @@
+import { DomainEventHandlerInterface, SubscriptionRefundedEvent } from '@standardnotes/domain-events'
+import { inject, injectable } from 'inversify'
+
+import TYPES from '../../Bootstrap/Types'
+import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { StatisticsMeasure } from '../Statistics/StatisticsMeasure'
+import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
+import { Period } from '../Time/Period'
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+
+@injectable()
+export class SubscriptionRefundedEventHandler implements DomainEventHandlerInterface {
+  constructor(
+    @inject(TYPES.GetUserAnalyticsId) private getUserAnalyticsId: GetUserAnalyticsId,
+    @inject(TYPES.AnalyticsStore) private analyticsStore: AnalyticsStoreInterface,
+    @inject(TYPES.StatisticsStore) private statisticsStore: StatisticsStoreInterface,
+  ) {}
+
+  async handle(event: SubscriptionRefundedEvent): Promise<void> {
+    const { analyticsId } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    await this.analyticsStore.markActivity([AnalyticsActivity.SubscriptionRefunded], analyticsId, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+
+    await this.markChurnActivity(analyticsId, event)
+  }
+
+  private async markChurnActivity(analyticsId: number, event: SubscriptionRefundedEvent): Promise<void> {
+    const churnActivity =
+      event.payload.userExistingSubscriptionsCount > 1
+        ? AnalyticsActivity.ExistingCustomersChurn
+        : AnalyticsActivity.NewCustomersChurn
+
+    for (const period of [Period.ThisMonth, Period.ThisWeek, Period.Today]) {
+      const customerPurchasedInPeriod = await this.analyticsStore.wasActivityDone(
+        AnalyticsActivity.SubscriptionPurchased,
+        analyticsId,
+        period,
+      )
+      if (customerPurchasedInPeriod) {
+        await this.analyticsStore.markActivity([churnActivity], analyticsId, [period])
+      }
+    }
+
+    await this.statisticsStore.setMeasure(
+      StatisticsMeasure.TotalCustomers,
+      event.payload.totalActiveSubscriptionsCount,
+      [Period.Today, Period.ThisWeek, Period.ThisMonth, Period.ThisYear],
+    )
+  }
+}

packages/analytics/src/Domain/Handler/SubscriptionRenewedEventHandler.spec.ts

@@ -0,0 +1,43 @@
+import 'reflect-metadata'
+
+import { SubscriptionName } from '@standardnotes/common'
+import { SubscriptionRenewedEvent } from '@standardnotes/domain-events'
+
+import { SubscriptionRenewedEventHandler } from './SubscriptionRenewedEventHandler'
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+
+describe('SubscriptionRenewedEventHandler', () => {
+  let event: SubscriptionRenewedEvent
+  let getUserAnalyticsId: GetUserAnalyticsId
+  let analyticsStore: AnalyticsStoreInterface
+
+  const createHandler = () => new SubscriptionRenewedEventHandler(getUserAnalyticsId, analyticsStore)
+
+  beforeEach(() => {
+    event = {} as jest.Mocked<SubscriptionRenewedEvent>
+    event.createdAt = new Date(1)
+    event.payload = {
+      subscriptionId: 1,
+      userEmail: 'test@test.com',
+      subscriptionName: SubscriptionName.ProPlan,
+      subscriptionExpiresAt: 2,
+      timestamp: 1,
+      offline: false,
+    }
+
+    getUserAnalyticsId = {} as jest.Mocked<GetUserAnalyticsId>
+    getUserAnalyticsId.execute = jest.fn().mockReturnValue({ analyticsId: 3 })
+
+    analyticsStore = {} as jest.Mocked<AnalyticsStoreInterface>
+    analyticsStore.markActivity = jest.fn()
+    analyticsStore.unmarkActivity = jest.fn()
+  })
+
+  it('should track subscription renewed statistics', async () => {
+    await createHandler().handle(event)
+
+    expect(analyticsStore.markActivity).toHaveBeenCalled()
+    expect(analyticsStore.unmarkActivity).toHaveBeenCalled()
+  })
+})

packages/analytics/src/Domain/Handler/SubscriptionRenewedEventHandler.ts

@@ -0,0 +1,30 @@
+import { DomainEventHandlerInterface, SubscriptionRenewedEvent } from '@standardnotes/domain-events'
+import { inject, injectable } from 'inversify'
+
+import TYPES from '../../Bootstrap/Types'
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { Period } from '../Time/Period'
+
+@injectable()
+export class SubscriptionRenewedEventHandler implements DomainEventHandlerInterface {
+  constructor(
+    @inject(TYPES.GetUserAnalyticsId) private getUserAnalyticsId: GetUserAnalyticsId,
+    @inject(TYPES.AnalyticsStore) private analyticsStore: AnalyticsStoreInterface,
+  ) {}
+
+  async handle(event: SubscriptionRenewedEvent): Promise<void> {
+    const { analyticsId } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    await this.analyticsStore.markActivity([AnalyticsActivity.SubscriptionRenewed], analyticsId, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+    await this.analyticsStore.unmarkActivity(
+      [AnalyticsActivity.ExistingCustomersChurn, AnalyticsActivity.NewCustomersChurn],
+      analyticsId,
+      [Period.Today, Period.ThisWeek, Period.ThisMonth],
+    )
+  }
+}

packages/analytics/src/Domain/Handler/UserRegisteredEventHandler.spec.ts

@@ -0,0 +1,47 @@
+import 'reflect-metadata'
+
+import { UserRegisteredEvent } from '@standardnotes/domain-events'
+import { ProtocolVersion } from '@standardnotes/common'
+
+import { UserRegisteredEventHandler } from './UserRegisteredEventHandler'
+import { AnalyticsEntityRepositoryInterface } from '../Entity/AnalyticsEntityRepositoryInterface'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { Period } from '../Time/Period'
+
+describe('UserRegisteredEventHandler', () => {
+  let analyticsEntityRepository: AnalyticsEntityRepositoryInterface
+  let event: UserRegisteredEvent
+  let analyticsStore: AnalyticsStoreInterface
+
+  const createHandler = () => new UserRegisteredEventHandler(analyticsEntityRepository, analyticsStore)
+
+  beforeEach(() => {
+    event = {} as jest.Mocked<UserRegisteredEvent>
+    event.createdAt = new Date(1)
+    event.payload = {
+      userUuid: '1-2-3',
+      email: 'test@test.te',
+      protocolVersion: ProtocolVersion.V004,
+    }
+
+    analyticsStore = {} as jest.Mocked<AnalyticsStoreInterface>
+    analyticsStore.markActivity = jest.fn()
+
+    analyticsEntityRepository = {} as jest.Mocked<AnalyticsEntityRepositoryInterface>
+    analyticsEntityRepository.save = jest.fn().mockImplementation((entity) => ({
+      ...entity,
+      id: 1,
+    }))
+  })
+
+  it('should save analytics entity upon user registration', async () => {
+    await createHandler().handle(event)
+
+    expect(analyticsEntityRepository.save).toHaveBeenCalled()
+    expect(analyticsStore.markActivity).toHaveBeenCalledWith(['register'], 1, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+  })
+})

packages/analytics/src/Domain/Handler/UserRegisteredEventHandler.ts

@@ -0,0 +1,30 @@
+import { DomainEventHandlerInterface, UserRegisteredEvent } from '@standardnotes/domain-events'
+import { inject, injectable } from 'inversify'
+
+import TYPES from '../../Bootstrap/Types'
+import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { AnalyticsEntity } from '../Entity/AnalyticsEntity'
+import { AnalyticsEntityRepositoryInterface } from '../Entity/AnalyticsEntityRepositoryInterface'
+import { Period } from '../Time/Period'
+
+@injectable()
+export class UserRegisteredEventHandler implements DomainEventHandlerInterface {
+  constructor(
+    @inject(TYPES.AnalyticsEntityRepository) private analyticsEntityRepository: AnalyticsEntityRepositoryInterface,
+    @inject(TYPES.AnalyticsStore) private analyticsStore: AnalyticsStoreInterface,
+  ) {}
+
+  async handle(event: UserRegisteredEvent): Promise<void> {
+    let analyticsEntity = new AnalyticsEntity()
+    analyticsEntity.userUuid = event.payload.userUuid
+    analyticsEntity.userEmail = event.payload.email
+    analyticsEntity = await this.analyticsEntityRepository.save(analyticsEntity)
+
+    await this.analyticsStore.markActivity([AnalyticsActivity.Register], analyticsEntity.id, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+  }
+}

packages/analytics/src/Domain/UseCase/GetUserAnalyticsId/GetUserAnalyticsId.spec.ts

@@ -0,0 +1,42 @@
+import 'reflect-metadata'
+
+import { AnalyticsEntity } from '../../Entity/AnalyticsEntity'
+import { AnalyticsEntityRepositoryInterface } from '../../Entity/AnalyticsEntityRepositoryInterface'
+
+import { GetUserAnalyticsId } from './GetUserAnalyticsId'
+
+describe('GetUserAnalyticsId', () => {
+  let analyticsEntityRepository: AnalyticsEntityRepositoryInterface
+  let analyticsEntity: AnalyticsEntity
+
+  const createUseCase = () => new GetUserAnalyticsId(analyticsEntityRepository)
+
+  beforeEach(() => {
+    analyticsEntity = { id: 123 } as jest.Mocked<AnalyticsEntity>
+
+    analyticsEntityRepository = {} as jest.Mocked<AnalyticsEntityRepositoryInterface>
+    analyticsEntityRepository.findOneByUserUuid = jest.fn().mockReturnValue(analyticsEntity)
+    analyticsEntityRepository.findOneByUserEmail = jest.fn().mockReturnValue(analyticsEntity)
+  })
+
+  it('should return analytics id for a user by uuid', async () => {
+    expect(await createUseCase().execute({ userUuid: '1-2-3' })).toEqual({ analyticsId: 123 })
+  })
+
+  it('should return analytics id for a user by email', async () => {
+    expect(await createUseCase().execute({ userEmail: 'test@test.te' })).toEqual({ analyticsId: 123 })
+  })
+
+  it('should throw error if user is missing analytics entity', async () => {
+    analyticsEntityRepository.findOneByUserUuid = jest.fn().mockReturnValue(null)
+    let error = null
+
+    try {
+      await createUseCase().execute({ userUuid: '1-2-3' })
+    } catch (caughtError) {
+      error = caughtError
+    }
+
+    expect(error).not.toBeNull()
+  })
+})

packages/analytics/src/Domain/UseCase/GetUserAnalyticsId/GetUserAnalyticsId.ts

@@ -0,0 +1,30 @@
+import { inject, injectable } from 'inversify'
+import TYPES from '../../../Bootstrap/Types'
+import { AnalyticsEntityRepositoryInterface } from '../../Entity/AnalyticsEntityRepositoryInterface'
+import { UseCaseInterface } from '../UseCaseInterface'
+import { GetUserAnalyticsIdDTO } from './GetUserAnalyticsIdDTO'
+import { GetUserAnalyticsIdResponse } from './GetUserAnalyticsIdResponse'
+
+@injectable()
+export class GetUserAnalyticsId implements UseCaseInterface {
+  constructor(
+    @inject(TYPES.AnalyticsEntityRepository) private analyticsEntityRepository: AnalyticsEntityRepositoryInterface,
+  ) {}
+
+  async execute(dto: GetUserAnalyticsIdDTO): Promise<GetUserAnalyticsIdResponse> {
+    let analyticsEntity = null
+    if (dto.userUuid) {
+      analyticsEntity = await this.analyticsEntityRepository.findOneByUserUuid(dto.userUuid)
+    } else if (dto.userEmail) {
+      analyticsEntity = await this.analyticsEntityRepository.findOneByUserEmail(dto.userEmail)
+    }
+
+    if (analyticsEntity === null) {
+      throw new Error(`Could not find analytics entity for user ${dto.userUuid}`)
+    }
+
+    return {
+      analyticsId: analyticsEntity.id,
+    }
+  }
+}

packages/analytics/src/Domain/UseCase/GetUserAnalyticsId/GetUserAnalyticsIdDTO.ts

@@ -0,0 +1,10 @@
+import { Either, Uuid } from '@standardnotes/common'
+
+export type GetUserAnalyticsIdDTO = Either<
+  {
+    userUuid: Uuid
+  },
+  {
+    userEmail: string
+  }
+>

packages/analytics/src/Domain/UseCase/GetUserAnalyticsId/GetUserAnalyticsIdResponse.ts

@@ -0,0 +1,3 @@
+export type GetUserAnalyticsIdResponse = {
+  analyticsId: number
+}

packages/analytics/src/Domain/UseCase/UseCaseInterface.ts

@@ -0,0 +1,3 @@
+export interface UseCaseInterface {
+  execute(...args: any[]): Promise<Record<string, unknown>>
+}

packages/analytics/src/Infra/MySQL/MySQLAnalyticsEntityRepository.spec.ts

@@ -20,6 +20,7 @@ describe('MySQLAnalyticsEntityRepository', () => {
 
     ormRepository = {} as jest.Mocked<Repository<AnalyticsEntity>>
     ormRepository.save = jest.fn()
+    ormRepository.remove = jest.fn()
     ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => queryBuilder)
   })
 
@@ -29,6 +30,12 @@ describe('MySQLAnalyticsEntityRepository', () => {
     expect(ormRepository.save).toHaveBeenCalledWith(analyticsEntity)
   })
 
+  it('should remove', async () => {
+    await createRepository().remove(analyticsEntity)
+
+    expect(ormRepository.remove).toHaveBeenCalledWith(analyticsEntity)
+  })
+
   it('should find one by user uuid', async () => {
     queryBuilder.where = jest.fn().mockReturnThis()
     queryBuilder.getOne = jest.fn().mockReturnValue(analyticsEntity)
@@ -39,4 +46,15 @@ describe('MySQLAnalyticsEntityRepository', () => {
 
     expect(result).toEqual(analyticsEntity)
   })
+
+  it('should find one by user email', async () => {
+    queryBuilder.where = jest.fn().mockReturnThis()
+    queryBuilder.getOne = jest.fn().mockReturnValue(analyticsEntity)
+
+    const result = await createRepository().findOneByUserEmail('test@test.te')
+
+    expect(queryBuilder.where).toHaveBeenCalledWith('analytics_entity.user_email = :email', { email: 'test@test.te' })
+
+    expect(result).toEqual(analyticsEntity)
+  })
 })

packages/analytics/src/Infra/MySQL/MySQLAnalyticsEntityRepository.ts

@@ -13,6 +13,13 @@ export class MySQLAnalyticsEntityRepository implements AnalyticsEntityRepository
     private ormRepository: Repository<AnalyticsEntity>,
   ) {}
 
+  async findOneByUserEmail(email: string): Promise<AnalyticsEntity | null> {
+    return this.ormRepository
+      .createQueryBuilder('analytics_entity')
+      .where('analytics_entity.user_email = :email', { email })
+      .getOne()
+  }
+
   async findOneByUserUuid(userUuid: Uuid): Promise<AnalyticsEntity | null> {
     return this.ormRepository
       .createQueryBuilder('analytics_entity')
@@ -23,4 +30,8 @@ export class MySQLAnalyticsEntityRepository implements AnalyticsEntityRepository
   async save(analyticsEntity: AnalyticsEntity): Promise<AnalyticsEntity> {
     return this.ormRepository.save(analyticsEntity)
   }
+
+  async remove(analyticsEntity: AnalyticsEntity): Promise<void> {
+    await this.ormRepository.remove(analyticsEntity)
+  }
 }

packages/analytics/tsconfig.json

@@ -6,7 +6,8 @@
   },
   "include": [
     "src/**/*",
-    "bin/**/*"
+    "bin/**/*",
+    "migrations/**/*"
   ],
   "references": []
 }

packages/api-gateway/.env.sample

@@ -27,9 +27,5 @@ NEW_RELIC_LOG_LEVEL=info
 REDIS_URL=redis://cache
 REDIS_EVENTS_CHANNEL=events
 
-# (Optional) SNS Setup
-SNS_TOPIC_ARN=
-SNS_AWS_REGION=
-
 # (Optional) Caching Cross Service Tokens
 CROSS_SERVICE_TOKEN_CACHE_TTL=

packages/api-gateway/CHANGELOG.md

@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.36.11](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.36.10...@standardnotes/api-gateway@1.36.11) (2022-11-07)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.36.10](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.36.9...@standardnotes/api-gateway@1.36.10) (2022-11-07)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.36.9](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.36.8...@standardnotes/api-gateway@1.36.9) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.36.8](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.36.7...@standardnotes/api-gateway@1.36.8) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.36.7](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.36.6...@standardnotes/api-gateway@1.36.7) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.36.6](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.36.5...@standardnotes/api-gateway@1.36.6) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.36.5](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.36.4...@standardnotes/api-gateway@1.36.5) (2022-11-04)
+
+### Bug Fixes
+
+* **api-gateway:** removing sns bindings ([b4c5b5a](https://github.com/standardnotes/api-gateway/commit/b4c5b5a84e4c619f175620b141279dfa8e2e6754))
+
+## [1.36.4](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.36.3...@standardnotes/api-gateway@1.36.4) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.36.3](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.36.2...@standardnotes/api-gateway@1.36.3) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
 ## [1.36.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.36.1...@standardnotes/api-gateway@1.36.2) (2022-11-04)
 
 **Note:** Version bump only for package @standardnotes/api-gateway

packages/api-gateway/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api-gateway",
-  "version": "1.36.2",
+  "version": "1.36.11",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/api-gateway/src/Bootstrap/Container.ts

@@ -2,7 +2,6 @@ import * as winston from 'winston'
 import axios, { AxiosInstance } from 'axios'
 import Redis from 'ioredis'
 import { Container } from 'inversify'
-import * as AWS from 'aws-sdk'
 import {
   AnalyticsStoreInterface,
   PeriodKeyGenerator,
@@ -11,7 +10,6 @@ import {
   RedisStatisticsStore,
   StatisticsStoreInterface,
 } from '@standardnotes/analytics'
-import { RedisDomainEventPublisher, SNSDomainEventPublisher } from '@standardnotes/domain-events-infra'
 import { Timer, TimerInterface } from '@standardnotes/time'
 
 import { Env } from './Env'
@@ -58,15 +56,6 @@ export class ContainerConfigLoader {
     }
     container.bind(TYPES.Redis).toConstantValue(redis)
 
-    if (env.get('SNS_AWS_REGION', true)) {
-      container.bind<AWS.SNS>(TYPES.SNS).toConstantValue(
-        new AWS.SNS({
-          apiVersion: 'latest',
-          region: env.get('SNS_AWS_REGION', true),
-        }),
-      )
-    }
-
     container.bind<AxiosInstance>(TYPES.HTTPClient).toConstantValue(axios.create())
 
     // env vars
@@ -81,8 +70,6 @@ export class ContainerConfigLoader {
       .bind(TYPES.HTTP_CALL_TIMEOUT)
       .toConstantValue(env.get('HTTP_CALL_TIMEOUT', true) ? +env.get('HTTP_CALL_TIMEOUT', true) : 60_000)
     container.bind(TYPES.VERSION).toConstantValue(env.get('VERSION'))
-    container.bind(TYPES.SNS_TOPIC_ARN).toConstantValue(env.get('SNS_TOPIC_ARN', true))
-    container.bind(TYPES.SNS_AWS_REGION).toConstantValue(env.get('SNS_AWS_REGION', true))
     container.bind(TYPES.REDIS_EVENTS_CHANNEL).toConstantValue(env.get('REDIS_EVENTS_CHANNEL'))
     container.bind(TYPES.CROSS_SERVICE_TOKEN_CACHE_TTL).toConstantValue(+env.get('CROSS_SERVICE_TOKEN_CACHE_TTL', true))
 
@@ -106,18 +93,6 @@ export class ContainerConfigLoader {
     container.bind<CrossServiceTokenCacheInterface>(TYPES.CrossServiceTokenCache).to(RedisCrossServiceTokenCache)
     container.bind<TimerInterface>(TYPES.Timer).toConstantValue(new Timer())
 
-    if (env.get('SNS_TOPIC_ARN', true)) {
-      container
-        .bind<SNSDomainEventPublisher>(TYPES.DomainEventPublisher)
-        .toConstantValue(new SNSDomainEventPublisher(container.get(TYPES.SNS), container.get(TYPES.SNS_TOPIC_ARN)))
-    } else {
-      container
-        .bind<RedisDomainEventPublisher>(TYPES.DomainEventPublisher)
-        .toConstantValue(
-          new RedisDomainEventPublisher(container.get(TYPES.Redis), container.get(TYPES.REDIS_EVENTS_CHANNEL)),
-        )
-    }
-
     return container
   }
 }

packages/api-gateway/src/Bootstrap/Types.ts

@@ -2,7 +2,6 @@ const TYPES = {
   Logger: Symbol.for('Logger'),
   Redis: Symbol.for('Redis'),
   HTTPClient: Symbol.for('HTTPClient'),
-  SNS: Symbol.for('SNS'),
   // env vars
   SYNCING_SERVER_JS_URL: Symbol.for('SYNCING_SERVER_JS_URL'),
   AUTH_SERVER_URL: Symbol.for('AUTH_SERVER_URL'),
@@ -13,8 +12,6 @@ const TYPES = {
   AUTH_JWT_SECRET: Symbol.for('AUTH_JWT_SECRET'),
   HTTP_CALL_TIMEOUT: Symbol.for('HTTP_CALL_TIMEOUT'),
   VERSION: Symbol.for('VERSION'),
-  SNS_TOPIC_ARN: Symbol.for('SNS_TOPIC_ARN'),
-  SNS_AWS_REGION: Symbol.for('SNS_AWS_REGION'),
   REDIS_EVENTS_CHANNEL: Symbol.for('REDIS_EVENTS_CHANNEL'),
   CROSS_SERVICE_TOKEN_CACHE_TTL: Symbol.for('CROSS_SERVICE_TOKEN_CACHE_TTL'),
   // Middleware
@@ -27,7 +24,6 @@ const TYPES = {
   CrossServiceTokenCache: Symbol.for('CrossServiceTokenCache'),
   AnalyticsStore: Symbol.for('AnalyticsStore'),
   StatisticsStore: Symbol.for('StatisticsStore'),
-  DomainEventPublisher: Symbol.for('DomainEventPublisher'),
   Timer: Symbol.for('Timer'),
   PeriodKeyGenerator: Symbol.for('PeriodKeyGenerator'),
 }

packages/auth/CHANGELOG.md

@@ -3,6 +3,48 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.50.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.49.13...@standardnotes/auth-server@1.50.0) (2022-11-07)
+
+### Features
+
+* **analytics:** add handling subscription refunded event ([197c991](https://github.com/standardnotes/server/commit/197c9914caf8fb31ce3ee69d05381d2a6416b366))
+
+## [1.49.13](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.49.12...@standardnotes/auth-server@1.49.13) (2022-11-07)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.49.12](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.49.11...@standardnotes/auth-server@1.49.12) (2022-11-04)
+
+### Bug Fixes
+
+* **auth:** event specs ([a3be4b0](https://github.com/standardnotes/server/commit/a3be4b063d679c125d152e7025750a6ca1d5d7a1))
+
+## [1.49.11](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.49.10...@standardnotes/auth-server@1.49.11) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.49.10](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.49.9...@standardnotes/auth-server@1.49.10) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.49.9](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.49.8...@standardnotes/auth-server@1.49.9) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.49.8](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.49.7...@standardnotes/auth-server@1.49.8) (2022-11-04)
+
+### Bug Fixes
+
+* **auth:** add user created at timestamp to account deletion event ([7b05bf8](https://github.com/standardnotes/server/commit/7b05bf899152a2f36ce1fa851e8d5821c67840d7))
+
+## [1.49.7](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.49.6...@standardnotes/auth-server@1.49.7) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.49.6](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.49.5...@standardnotes/auth-server@1.49.6) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
 ## [1.49.5](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.49.4...@standardnotes/auth-server@1.49.5) (2022-11-04)
 
 **Note:** Version bump only for package @standardnotes/auth-server

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/auth-server",
-  "version": "1.49.5",
+  "version": "1.50.0",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/auth/src/Domain/Event/DomainEventFactory.spec.ts

@@ -363,6 +363,7 @@ describe('DomainEventFactory', () => {
     expect(
       createFactory().createAccountDeletionRequestedEvent({
         userUuid: '1-2-3',
+        userCreatedAtTimestamp: 123,
         regularSubscriptionUuid: '2-3-4',
       }),
     ).toEqual({
@@ -376,6 +377,7 @@ describe('DomainEventFactory', () => {
       },
       payload: {
         userUuid: '1-2-3',
+        userCreatedAtTimestamp: 123,
         regularSubscriptionUuid: '2-3-4',
       },
       type: 'ACCOUNT_DELETION_REQUESTED',

packages/auth/src/Domain/Event/DomainEventFactory.ts

@@ -254,6 +254,7 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
 
   createAccountDeletionRequestedEvent(dto: {
     userUuid: Uuid
+    userCreatedAtTimestamp: number
     regularSubscriptionUuid: Uuid | undefined
   }): AccountDeletionRequestedEvent {
     return {

packages/auth/src/Domain/Event/DomainEventFactoryInterface.ts

@@ -55,6 +55,7 @@ export interface DomainEventFactoryInterface {
   ): CloudBackupRequestedEvent
   createAccountDeletionRequestedEvent(dto: {
     userUuid: Uuid
+    userCreatedAtTimestamp: number
     regularSubscriptionUuid: Uuid | undefined
   }): AccountDeletionRequestedEvent
   createUserRolesChangedEvent(userUuid: string, email: string, currentRoles: RoleName[]): UserRolesChangedEvent

packages/auth/src/Domain/Handler/AccountDeletionRequestedEventHandler.spec.ts

@@ -80,6 +80,7 @@ describe('AccountDeletionRequestedEventHandler', () => {
     event.createdAt = new Date(1)
     event.payload = {
       userUuid: '1-2-3',
+      userCreatedAtTimestamp: 1,
       regularSubscriptionUuid: '2-3-4',
     }
 

packages/auth/src/Domain/Handler/SubscriptionCancelledEventHandler.spec.ts

@@ -71,6 +71,10 @@ describe('SubscriptionCancelledEventHandler', () => {
       timestamp,
       offline: false,
       replaced: false,
+      subscriptionCreatedAt: 1,
+      subscriptionEndsAt: 2,
+      subscriptionUpdatedAt: 2,
+      lastPayedAt: 1,
     }
   })
 

packages/auth/src/Domain/Handler/SubscriptionRefundedEventHandler.spec.ts

@@ -80,6 +80,8 @@ describe('SubscriptionRefundedEventHandler', () => {
       subscriptionName: SubscriptionName.PlusPlan,
       timestamp,
       offline: false,
+      userExistingSubscriptionsCount: 3,
+      totalActiveSubscriptionsCount: 1,
     }
 
     getUserAnalyticsId = {} as jest.Mocked<GetUserAnalyticsId>

packages/auth/src/Domain/UseCase/DeleteAccount/DeleteAccount.spec.ts

@@ -8,6 +8,7 @@ import { DeleteAccount } from './DeleteAccount'
 import { UserSubscription } from '../../Subscription/UserSubscription'
 import { UserSubscriptionType } from '../../Subscription/UserSubscriptionType'
 import { UserSubscriptionServiceInterface } from '../../Subscription/UserSubscriptionServiceInterface'
+import { TimerInterface } from '@standardnotes/time'
 
 describe('DeleteAccount', () => {
   let userRepository: UserRepositoryInterface
@@ -16,9 +17,10 @@ describe('DeleteAccount', () => {
   let userSubscriptionService: UserSubscriptionServiceInterface
   let user: User
   let regularSubscription: UserSubscription
+  let timer: TimerInterface
 
   const createUseCase = () =>
-    new DeleteAccount(userRepository, userSubscriptionService, domainEventPublisher, domainEventFactory)
+    new DeleteAccount(userRepository, userSubscriptionService, domainEventPublisher, domainEventFactory, timer)
 
   beforeEach(() => {
     user = {
@@ -46,6 +48,9 @@ describe('DeleteAccount', () => {
     domainEventFactory.createAccountDeletionRequestedEvent = jest
       .fn()
       .mockReturnValue({} as jest.Mocked<AccountDeletionRequestedEvent>)
+
+    timer = {} as jest.Mocked<TimerInterface>
+    timer.convertDateToMicroseconds = jest.fn().mockReturnValue(1)
   })
 
   it('should trigger account deletion - no subscription', async () => {
@@ -62,6 +67,7 @@ describe('DeleteAccount', () => {
     expect(domainEventPublisher.publish).toHaveBeenCalledTimes(1)
     expect(domainEventFactory.createAccountDeletionRequestedEvent).toHaveBeenLastCalledWith({
       userUuid: '1-2-3',
+      userCreatedAtTimestamp: 1,
       regularSubscriptionUuid: undefined,
     })
   })
@@ -80,6 +86,7 @@ describe('DeleteAccount', () => {
     expect(domainEventPublisher.publish).toHaveBeenCalledTimes(1)
     expect(domainEventFactory.createAccountDeletionRequestedEvent).toHaveBeenLastCalledWith({
       userUuid: '1-2-3',
+      userCreatedAtTimestamp: 1,
       regularSubscriptionUuid: '1-2-3',
     })
   })

packages/auth/src/Domain/UseCase/DeleteAccount/DeleteAccount.ts

@@ -1,10 +1,13 @@
 import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
+import { TimerInterface } from '@standardnotes/time'
 import { inject, injectable } from 'inversify'
+
 import TYPES from '../../../Bootstrap/Types'
 import { DomainEventFactoryInterface } from '../../Event/DomainEventFactoryInterface'
 import { UserSubscriptionServiceInterface } from '../../Subscription/UserSubscriptionServiceInterface'
 import { UserRepositoryInterface } from '../../User/UserRepositoryInterface'
 import { UseCaseInterface } from '../UseCaseInterface'
+
 import { DeleteAccountDTO } from './DeleteAccountDTO'
 import { DeleteAccountResponse } from './DeleteAccountResponse'
 
@@ -15,6 +18,7 @@ export class DeleteAccount implements UseCaseInterface {
     @inject(TYPES.UserSubscriptionService) private userSubscriptionService: UserSubscriptionServiceInterface,
     @inject(TYPES.DomainEventPublisher) private domainEventPublisher: DomainEventPublisherInterface,
     @inject(TYPES.DomainEventFactory) private domainEventFactory: DomainEventFactoryInterface,
+    @inject(TYPES.Timer) private timer: TimerInterface,
   ) {}
 
   async execute(dto: DeleteAccountDTO): Promise<DeleteAccountResponse> {
@@ -37,6 +41,7 @@ export class DeleteAccount implements UseCaseInterface {
     await this.domainEventPublisher.publish(
       this.domainEventFactory.createAccountDeletionRequestedEvent({
         userUuid: user.uuid,
+        userCreatedAtTimestamp: this.timer.convertDateToMicroseconds(user.createdAt),
         regularSubscriptionUuid,
       }),
     )

packages/domain-events-infra/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.9.10](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.9.9...@standardnotes/domain-events-infra@1.9.10) (2022-11-07)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
+## [1.9.9](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.9.8...@standardnotes/domain-events-infra@1.9.9) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
+## [1.9.8](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.9.7...@standardnotes/domain-events-infra@1.9.8) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
 ## [1.9.7](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.9.6...@standardnotes/domain-events-infra@1.9.7) (2022-11-04)
 
 **Note:** Version bump only for package @standardnotes/domain-events-infra

packages/domain-events-infra/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/domain-events-infra",
-  "version": "1.9.7",
+  "version": "1.9.10",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/domain-events/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.76.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.75.0...@standardnotes/domain-events@2.76.0) (2022-11-07)
+
+### Features
+
+* **analytics:** add handling subscription refunded event ([197c991](https://github.com/standardnotes/server/commit/197c9914caf8fb31ce3ee69d05381d2a6416b366))
+
+# [2.75.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.74.1...@standardnotes/domain-events@2.75.0) (2022-11-04)
+
+### Features
+
+* **analytics:** add subscription cancelled event handler ([037fb23](https://github.com/standardnotes/server/commit/037fb2398ae9aaa11682e1a8576bab28c69e0f9b))
+
+## [2.74.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.74.0...@standardnotes/domain-events@2.74.1) (2022-11-04)
+
+### Bug Fixes
+
+* **auth:** add user created at timestamp to account deletion event ([7b05bf8](https://github.com/standardnotes/server/commit/7b05bf899152a2f36ce1fa851e8d5821c67840d7))
+
 # [2.74.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.73.1...@standardnotes/domain-events@2.74.0) (2022-11-04)
 
 ### Features

packages/domain-events/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/domain-events",
-  "version": "2.74.0",
+  "version": "2.76.0",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/domain-events/src/Domain/Event/AccountDeletionRequestedEventPayload.ts

@@ -2,5 +2,6 @@ import { Uuid } from '@standardnotes/common'
 
 export interface AccountDeletionRequestedEventPayload {
   userUuid: string
+  userCreatedAtTimestamp: number
   regularSubscriptionUuid: Uuid | undefined
 }

packages/domain-events/src/Domain/Event/SubscriptionCancelledEventPayload.ts

@@ -4,6 +4,10 @@ export interface SubscriptionCancelledEventPayload {
   userEmail: string
   subscriptionId: number
   subscriptionName: SubscriptionName
+  subscriptionCreatedAt: number
+  subscriptionUpdatedAt: number
+  lastPayedAt: number
+  subscriptionEndsAt: number
   timestamp: number
   offline: boolean
   replaced: boolean

packages/domain-events/src/Domain/Event/SubscriptionRefundedEventPayload.ts

@@ -4,6 +4,8 @@ export interface SubscriptionRefundedEventPayload {
   userEmail: string
   subscriptionId: number
   subscriptionName: SubscriptionName
+  userExistingSubscriptionsCount: number
+  totalActiveSubscriptionsCount: number
   timestamp: number
   offline: boolean
 }

packages/event-store/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.5](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.6.4...@standardnotes/event-store@1.6.5) (2022-11-07)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.6.4](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.6.3...@standardnotes/event-store@1.6.4) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.6.3](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.6.2...@standardnotes/event-store@1.6.3) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
 ## [1.6.2](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.6.1...@standardnotes/event-store@1.6.2) (2022-11-04)
 
 **Note:** Version bump only for package @standardnotes/event-store

packages/event-store/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/event-store",
-  "version": "1.6.2",
+  "version": "1.6.5",
   "description": "Event Store Service",
   "private": true,
   "main": "dist/src/index.js",

packages/files/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.8.5](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.8.4...@standardnotes/files-server@1.8.5) (2022-11-07)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.8.4](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.8.3...@standardnotes/files-server@1.8.4) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.8.3](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.8.2...@standardnotes/files-server@1.8.3) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
 ## [1.8.2](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.8.1...@standardnotes/files-server@1.8.2) (2022-11-04)
 
 **Note:** Version bump only for package @standardnotes/files-server

packages/files/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/files-server",
-  "version": "1.8.2",
+  "version": "1.8.5",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/scheduler/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.13.6](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.13.5...@standardnotes/scheduler-server@1.13.6) (2022-11-07)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.13.5](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.13.4...@standardnotes/scheduler-server@1.13.5) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.13.4](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.13.3...@standardnotes/scheduler-server@1.13.4) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
 ## [1.13.3](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.13.2...@standardnotes/scheduler-server@1.13.3) (2022-11-04)
 
 **Note:** Version bump only for package @standardnotes/scheduler-server

packages/scheduler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/scheduler-server",
-  "version": "1.13.3",
+  "version": "1.13.6",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/syncing-server/CHANGELOG.md

@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.10.22](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.10.21...@standardnotes/syncing-server@1.10.22) (2022-11-07)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.10.21](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.10.20...@standardnotes/syncing-server@1.10.21) (2022-11-07)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.10.20](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.10.19...@standardnotes/syncing-server@1.10.20) (2022-11-04)
+
+### Bug Fixes
+
+* **syncing-server:** event specs ([182512d](https://github.com/standardnotes/syncing-server-js/commit/182512d07c68ae644594404724bf1a0f5e0c71ae))
+
+## [1.10.19](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.10.18...@standardnotes/syncing-server@1.10.19) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.10.18](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.10.17...@standardnotes/syncing-server@1.10.18) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.10.17](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.10.16...@standardnotes/syncing-server@1.10.17) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.10.16](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.10.15...@standardnotes/syncing-server@1.10.16) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.10.15](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.10.14...@standardnotes/syncing-server@1.10.15) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.10.14](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.10.13...@standardnotes/syncing-server@1.10.14) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
 ## [1.10.13](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.10.12...@standardnotes/syncing-server@1.10.13) (2022-11-04)
 
 **Note:** Version bump only for package @standardnotes/syncing-server

packages/syncing-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/syncing-server",
-  "version": "1.10.13",
+  "version": "1.10.22",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/syncing-server/src/Domain/Handler/AccountDeletionRequestedEventHandler.spec.ts

@@ -31,6 +31,7 @@ describe('AccountDeletionRequestedEventHandler', () => {
     event.createdAt = new Date(1)
     event.payload = {
       userUuid: '2-3-4',
+      userCreatedAtTimestamp: 1,
       regularSubscriptionUuid: '1-2-3',
     }
   })

packages/websockets/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.5](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.4.4...@standardnotes/websockets-server@1.4.5) (2022-11-07)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
+## [1.4.4](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.4.3...@standardnotes/websockets-server@1.4.4) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
+## [1.4.3](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.4.2...@standardnotes/websockets-server@1.4.3) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
 ## [1.4.2](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.4.1...@standardnotes/websockets-server@1.4.2) (2022-11-04)
 
 **Note:** Version bump only for package @standardnotes/websockets-server

packages/websockets/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/websockets-server",
-  "version": "1.4.2",
+  "version": "1.4.5",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/workspace/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.17.5](https://github.com/standardnotes/server/compare/@standardnotes/workspace-server@1.17.4...@standardnotes/workspace-server@1.17.5) (2022-11-07)
+
+**Note:** Version bump only for package @standardnotes/workspace-server
+
+## [1.17.4](https://github.com/standardnotes/server/compare/@standardnotes/workspace-server@1.17.3...@standardnotes/workspace-server@1.17.4) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/workspace-server
+
+## [1.17.3](https://github.com/standardnotes/server/compare/@standardnotes/workspace-server@1.17.2...@standardnotes/workspace-server@1.17.3) (2022-11-04)
+
+**Note:** Version bump only for package @standardnotes/workspace-server
+
 ## [1.17.2](https://github.com/standardnotes/server/compare/@standardnotes/workspace-server@1.17.1...@standardnotes/workspace-server@1.17.2) (2022-11-04)
 
 **Note:** Version bump only for package @standardnotes/workspace-server

packages/workspace/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/workspace-server",
-  "version": "1.17.2",
+  "version": "1.17.5",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },