chore(release): publish new version

- @standardnotes/analytics@1.21.0
 - @standardnotes/api-gateway@1.15.10
 - @standardnotes/auth-server@1.23.0
 - @standardnotes/syncing-server@1.6.57

packages/analytics/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.
 
+# [1.21.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.20.0...@standardnotes/analytics@1.21.0) (2022-09-05)
+
+### Features
+
+* **auth:** add measuring subscription length ([fa10827](https://github.com/standardnotes/server/commit/fa108274430d8dff1016ddcba5bbcb2778eb781b))
+
+# [1.20.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.19.0...@standardnotes/analytics@1.20.0) (2022-09-05)
+
+### Features
+
+* **auth:** add keeping stats on payments ([0c176b7](https://github.com/standardnotes/server/commit/0c176b70f8281e1e490224b9c7ab85f272a3d4e9))
+
+# [1.19.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.18.1...@standardnotes/analytics@1.19.0) (2022-09-05)
+
+### Features
+
+* **analytics:** add statistics measurements tracking ([a36cb92](https://github.com/standardnotes/server/commit/a36cb925ff3bd8396a53f58c3e954549e904d694))
+
 ## [1.18.1](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.18.0...@standardnotes/analytics@1.18.1) (2022-08-15)
 
 ### Bug Fixes

packages/analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/analytics",
-  "version": "1.18.1",
+  "version": "1.21.0",
   "engines": {
     "node": ">=14.0.0 <17.0.0"
   },
@@ -23,7 +23,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest spec --coverage"
+    "test": "jest spec --coverage"
   },
   "devDependencies": {
     "@types/ioredis": "^4.28.10",

packages/analytics/src/Domain/Statistics/StatisticsMeasure.ts

@@ -0,0 +1,4 @@
+export enum StatisticsMeasure {
+  PaymentSuccess = 'payment-success',
+  SubscriptionLength = 'subscription-length',
+}

packages/analytics/src/Domain/Statistics/StatisticsStoreInterface.ts

@@ -1,3 +1,6 @@
+import { Period } from '../Time/Period'
+import { StatisticsMeasure } from './StatisticsMeasure'
+
 export interface StatisticsStoreInterface {
   incrementSNJSVersionUsage(snjsVersion: string): Promise<void>
   incrementApplicationVersionUsage(applicationVersion: string): Promise<void>
@@ -5,4 +8,7 @@ export interface StatisticsStoreInterface {
   getYesterdaySNJSUsage(): Promise<Array<{ version: string; count: number }>>
   getYesterdayApplicationUsage(): Promise<Array<{ version: string; count: number }>>
   getYesterdayOutOfSyncIncidents(): Promise<number>
+  incrementMeasure(measure: StatisticsMeasure, value: number, periods: Period[]): Promise<void>
+  getMeasureAverage(measure: StatisticsMeasure, period: Period): Promise<number>
+  getMeasureTotal(measure: StatisticsMeasure, period: Period): Promise<number>
 }

packages/analytics/src/Domain/index.ts

@@ -1,5 +1,6 @@
 export * from './Analytics/AnalyticsActivity'
 export * from './Analytics/AnalyticsStoreInterface'
+export * from './Statistics/StatisticsMeasure'
 export * from './Statistics/StatisticsStoreInterface'
 export * from './Time/Period'
 export * from './Time/PeriodKeyGenerator'

packages/analytics/src/Infra/Redis/RedisStatisticsStore.spec.ts

@@ -1,5 +1,6 @@
 import * as IORedis from 'ioredis'
-import { PeriodKeyGeneratorInterface } from '../../Domain'
+import { Period, PeriodKeyGeneratorInterface } from '../../Domain'
+import { StatisticsMeasure } from '../../Domain/Statistics/StatisticsMeasure'
 
 import { RedisStatisticsStore } from './RedisStatisticsStore'
 
@@ -13,6 +14,7 @@ describe('RedisStatisticsStore', () => {
   beforeEach(() => {
     pipeline = {} as jest.Mocked<IORedis.Pipeline>
     pipeline.incr = jest.fn()
+    pipeline.incrby = jest.fn()
     pipeline.setbit = jest.fn()
     pipeline.exec = jest.fn()
 
@@ -88,4 +90,30 @@ describe('RedisStatisticsStore', () => {
     expect(pipeline.incr).toHaveBeenCalled()
     expect(pipeline.exec).toHaveBeenCalled()
   })
+
+  it('should increment measure by a value', async () => {
+    await createStore().incrementMeasure(StatisticsMeasure.PaymentSuccess, 2, [Period.Today, Period.ThisMonth])
+
+    expect(pipeline.incr).toHaveBeenCalledTimes(2)
+    expect(pipeline.incrby).toHaveBeenCalledTimes(2)
+    expect(pipeline.exec).toHaveBeenCalled()
+  })
+
+  it('should count a measurement average', async () => {
+    redisClient.get = jest.fn().mockReturnValueOnce('5').mockReturnValueOnce('2')
+
+    expect(await createStore().getMeasureAverage(StatisticsMeasure.PaymentSuccess, Period.Today)).toEqual(2 / 5)
+  })
+
+  it('should count a measurement average - 0 increments', async () => {
+    redisClient.get = jest.fn().mockReturnValueOnce(null).mockReturnValueOnce(null)
+
+    expect(await createStore().getMeasureAverage(StatisticsMeasure.PaymentSuccess, Period.Today)).toEqual(0)
+  })
+
+  it('should count a measurement average - 0 total value', async () => {
+    redisClient.get = jest.fn().mockReturnValueOnce(5).mockReturnValueOnce(null)
+
+    expect(await createStore().getMeasureAverage(StatisticsMeasure.PaymentSuccess, Period.Today)).toEqual(0)
+  })
 })

packages/analytics/src/Infra/Redis/RedisStatisticsStore.ts

@@ -1,12 +1,49 @@
 import * as IORedis from 'ioredis'
 
 import { Period, PeriodKeyGeneratorInterface } from '../../Domain'
+import { StatisticsMeasure } from '../../Domain/Statistics/StatisticsMeasure'
 
 import { StatisticsStoreInterface } from '../../Domain/Statistics/StatisticsStoreInterface'
 
 export class RedisStatisticsStore implements StatisticsStoreInterface {
   constructor(private periodKeyGenerator: PeriodKeyGeneratorInterface, private redisClient: IORedis.Redis) {}
 
+  async getMeasureTotal(measure: StatisticsMeasure, period: Period): Promise<number> {
+    const totalValue = await this.redisClient.get(
+      `count:measure:${measure}:timespan:${this.periodKeyGenerator.getPeriodKey(period)}`,
+    )
+
+    if (totalValue === null) {
+      return 0
+    }
+
+    return +totalValue
+  }
+
+  async incrementMeasure(measure: StatisticsMeasure, value: number, periods: Period[]): Promise<void> {
+    const pipeline = this.redisClient.pipeline()
+
+    for (const period of periods) {
+      pipeline.incrby(`count:measure:${measure}:timespan:${this.periodKeyGenerator.getPeriodKey(period)}`, value)
+      pipeline.incr(`count:increments:${measure}:timespan:${this.periodKeyGenerator.getPeriodKey(period)}`)
+    }
+
+    await pipeline.exec()
+  }
+
+  async getMeasureAverage(measure: StatisticsMeasure, period: Period): Promise<number> {
+    const increments = await this.redisClient.get(
+      `count:increments:${measure}:timespan:${this.periodKeyGenerator.getPeriodKey(period)}`,
+    )
+    if (increments === null) {
+      return 0
+    }
+
+    const totalValue = await this.getMeasureTotal(measure, period)
+
+    return totalValue / +increments
+  }
+
   async getYesterdayOutOfSyncIncidents(): Promise<number> {
     const count = await this.redisClient.get(
       `count:action:out-of-sync:timespan:${this.periodKeyGenerator.getPeriodKey(Period.Yesterday)}`,

packages/api-gateway/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.15.10](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.15.9...@standardnotes/api-gateway@1.15.10) (2022-09-05)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.15.9](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.15.8...@standardnotes/api-gateway@1.15.9) (2022-09-05)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.15.8](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.15.7...@standardnotes/api-gateway@1.15.8) (2022-09-05)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.15.7](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.15.6...@standardnotes/api-gateway@1.15.7) (2022-09-05)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.15.6](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.15.5...@standardnotes/api-gateway@1.15.6) (2022-09-01)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
 ## [1.15.5](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.15.4...@standardnotes/api-gateway@1.15.5) (2022-09-01)
 
 **Note:** Version bump only for package @standardnotes/api-gateway

packages/api-gateway/package.json

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

packages/auth/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.23.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.22.1...@standardnotes/auth-server@1.23.0) (2022-09-05)
+
+### Features
+
+* **auth:** add measuring subscription length ([fa10827](https://github.com/standardnotes/server/commit/fa108274430d8dff1016ddcba5bbcb2778eb781b))
+
+## [1.22.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.22.0...@standardnotes/auth-server@1.22.1) (2022-09-05)
+
+### Bug Fixes
+
+* **auth:** StatisticsStore binding ([34315c9](https://github.com/standardnotes/server/commit/34315c91d7428bbe8297e50972aa7823e2a983b2))
+
+# [1.22.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.21.5...@standardnotes/auth-server@1.22.0) (2022-09-05)
+
+### Features
+
+* **auth:** add keeping stats on payments ([0c176b7](https://github.com/standardnotes/server/commit/0c176b70f8281e1e490224b9c7ab85f272a3d4e9))
+
+## [1.21.5](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.21.4...@standardnotes/auth-server@1.21.5) (2022-09-05)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.21.4](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.21.3...@standardnotes/auth-server@1.21.4) (2022-09-05)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.21.3](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.21.2...@standardnotes/auth-server@1.21.3) (2022-09-01)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
 ## [1.21.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.21.1...@standardnotes/auth-server@1.21.2) (2022-09-01)
 
 **Note:** Version bump only for package @standardnotes/auth-server

packages/auth/package.json

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

packages/auth/src/Bootstrap/Container.ts

@@ -9,7 +9,13 @@ import {
 } from '@standardnotes/domain-events'
 import { TimerInterface, Timer } from '@standardnotes/time'
 import { UAParser } from 'ua-parser-js'
-import { AnalyticsStoreInterface, PeriodKeyGenerator, RedisAnalyticsStore } from '@standardnotes/analytics'
+import {
+  AnalyticsStoreInterface,
+  PeriodKeyGenerator,
+  RedisAnalyticsStore,
+  RedisStatisticsStore,
+  StatisticsStoreInterface,
+} from '@standardnotes/analytics'
 
 import { Env } from './Env'
 import TYPES from './Types'
@@ -542,9 +548,13 @@ export class ContainerConfigLoader {
       .bind<SelectorInterface<boolean>>(TYPES.BooleanSelector)
       .toConstantValue(new DeterministicSelector<boolean>())
     container.bind<UserSubscriptionServiceInterface>(TYPES.UserSubscriptionService).to(UserSubscriptionService)
+    const periodKeyGenerator = new PeriodKeyGenerator()
     container
       .bind<AnalyticsStoreInterface>(TYPES.AnalyticsStore)
-      .toConstantValue(new RedisAnalyticsStore(new PeriodKeyGenerator(), container.get(TYPES.Redis)))
+      .toConstantValue(new RedisAnalyticsStore(periodKeyGenerator, container.get(TYPES.Redis)))
+    container
+      .bind<StatisticsStoreInterface>(TYPES.StatisticsStore)
+      .toConstantValue(new RedisStatisticsStore(periodKeyGenerator, container.get(TYPES.Redis)))
 
     if (env.get('SNS_TOPIC_ARN', true)) {
       container

packages/auth/src/Bootstrap/Types.ts

@@ -186,6 +186,7 @@ const TYPES = {
   BooleanSelector: Symbol.for('BooleanSelector'),
   UserSubscriptionService: Symbol.for('UserSubscriptionService'),
   AnalyticsStore: Symbol.for('AnalyticsStore'),
+  StatisticsStore: Symbol.for('StatisticsStore'),
 }
 
 export default TYPES

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

@@ -1,7 +1,7 @@
 import 'reflect-metadata'
 
 import { PaymentSuccessEvent } from '@standardnotes/domain-events'
-import { AnalyticsStoreInterface } from '@standardnotes/analytics'
+import { AnalyticsStoreInterface, StatisticsStoreInterface } from '@standardnotes/analytics'
 
 import { PaymentSuccessEventHandler } from './PaymentSuccessEventHandler'
 import { UserRepositoryInterface } from '../User/UserRepositoryInterface'
@@ -14,8 +14,10 @@ describe('PaymentSuccessEventHandler', () => {
   let user: User
   let getUserAnalyticsId: GetUserAnalyticsId
   let analyticsStore: AnalyticsStoreInterface
+  let statisticsStore: StatisticsStoreInterface
 
-  const createHandler = () => new PaymentSuccessEventHandler(userRepository, getUserAnalyticsId, analyticsStore)
+  const createHandler = () =>
+    new PaymentSuccessEventHandler(userRepository, getUserAnalyticsId, analyticsStore, statisticsStore)
 
   beforeEach(() => {
     user = {} as jest.Mocked<User>
@@ -29,9 +31,13 @@ describe('PaymentSuccessEventHandler', () => {
     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,
     }
   })
 
@@ -39,6 +45,7 @@ describe('PaymentSuccessEventHandler', () => {
     await createHandler().handle(event)
 
     expect(analyticsStore.markActivity).toHaveBeenCalled()
+    expect(statisticsStore.incrementMeasure).toHaveBeenCalled()
   })
 
   it('should not mark payment failed for analytics if user is not found', async () => {

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

@@ -1,4 +1,10 @@
-import { AnalyticsActivity, AnalyticsStoreInterface, Period } from '@standardnotes/analytics'
+import {
+  AnalyticsActivity,
+  AnalyticsStoreInterface,
+  Period,
+  StatisticsMeasure,
+  StatisticsStoreInterface,
+} from '@standardnotes/analytics'
 import { DomainEventHandlerInterface, PaymentSuccessEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
 
@@ -12,6 +18,7 @@ export class PaymentSuccessEventHandler implements DomainEventHandlerInterface {
     @inject(TYPES.UserRepository) private userRepository: UserRepositoryInterface,
     @inject(TYPES.GetUserAnalyticsId) private getUserAnalyticsId: GetUserAnalyticsId,
     @inject(TYPES.AnalyticsStore) private analyticsStore: AnalyticsStoreInterface,
+    @inject(TYPES.StatisticsStore) private statisticsStore: StatisticsStoreInterface,
   ) {}
 
   async handle(event: PaymentSuccessEvent): Promise<void> {
@@ -26,5 +33,11 @@ export class PaymentSuccessEventHandler implements DomainEventHandlerInterface {
       Period.ThisWeek,
       Period.ThisMonth,
     ])
+
+    await this.statisticsStore.incrementMeasure(StatisticsMeasure.PaymentSuccess, event.payload.amount, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
   }
 }

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

@@ -8,10 +8,11 @@ import * as dayjs from 'dayjs'
 import { SubscriptionCancelledEventHandler } from './SubscriptionCancelledEventHandler'
 import { UserSubscriptionRepositoryInterface } from '../Subscription/UserSubscriptionRepositoryInterface'
 import { OfflineUserSubscriptionRepositoryInterface } from '../Subscription/OfflineUserSubscriptionRepositoryInterface'
-import { AnalyticsStoreInterface } from '@standardnotes/analytics'
+import { AnalyticsStoreInterface, Period, StatisticsMeasure, StatisticsStoreInterface } from '@standardnotes/analytics'
 import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
 import { UserRepositoryInterface } from '../User/UserRepositoryInterface'
 import { User } from '../User/User'
+import { UserSubscription } from '../Subscription/UserSubscription'
 
 describe('SubscriptionCancelledEventHandler', () => {
   let userSubscriptionRepository: UserSubscriptionRepositoryInterface
@@ -20,6 +21,7 @@ describe('SubscriptionCancelledEventHandler', () => {
   let userRepository: UserRepositoryInterface
   let getUserAnalyticsId: GetUserAnalyticsId
   let analyticsStore: AnalyticsStoreInterface
+  let statisticsStore: StatisticsStoreInterface
   let timestamp: number
 
   const createHandler = () =>
@@ -29,6 +31,7 @@ describe('SubscriptionCancelledEventHandler', () => {
       userRepository,
       getUserAnalyticsId,
       analyticsStore,
+      statisticsStore,
     )
 
   beforeEach(() => {
@@ -43,8 +46,16 @@ describe('SubscriptionCancelledEventHandler', () => {
     analyticsStore = {} as jest.Mocked<AnalyticsStoreInterface>
     analyticsStore.markActivity = jest.fn()
 
+    statisticsStore = {} as jest.Mocked<StatisticsStoreInterface>
+    statisticsStore.incrementMeasure = jest.fn()
+
+    const userSubscription = {
+      createdAt: 1642395451515000,
+    } as jest.Mocked<UserSubscription>
+
     userSubscriptionRepository = {} as jest.Mocked<UserSubscriptionRepositoryInterface>
     userSubscriptionRepository.updateCancelled = jest.fn()
+    userSubscriptionRepository.findBySubscriptionId = jest.fn().mockReturnValue([userSubscription])
 
     offlineUserSubscriptionRepository = {} as jest.Mocked<OfflineUserSubscriptionRepositoryInterface>
     offlineUserSubscriptionRepository.updateCancelled = jest.fn()
@@ -59,14 +70,21 @@ describe('SubscriptionCancelledEventHandler', () => {
       subscriptionName: SubscriptionName.ProPlan,
       timestamp,
       offline: false,
+      replaced: false,
     }
   })
 
   it('should update subscription cancelled', async () => {
+    event.payload.timestamp = 1642395451516000
     await createHandler().handle(event)
 
-    expect(userSubscriptionRepository.updateCancelled).toHaveBeenCalledWith(1, true, timestamp)
+    expect(userSubscriptionRepository.updateCancelled).toHaveBeenCalledWith(1, true, 1642395451516000)
     expect(analyticsStore.markActivity).toHaveBeenCalled()
+    expect(statisticsStore.incrementMeasure).toHaveBeenCalledWith(StatisticsMeasure.SubscriptionLength, 1000, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
   })
 
   it('should update subscription cancelled - user not found', async () => {

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

@@ -1,12 +1,19 @@
 import { DomainEventHandlerInterface, SubscriptionCancelledEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
+import {
+  AnalyticsActivity,
+  AnalyticsStoreInterface,
+  Period,
+  StatisticsMeasure,
+  StatisticsStoreInterface,
+} from '@standardnotes/analytics'
 
 import TYPES from '../../Bootstrap/Types'
 import { UserSubscriptionRepositoryInterface } from '../Subscription/UserSubscriptionRepositoryInterface'
 import { OfflineUserSubscriptionRepositoryInterface } from '../Subscription/OfflineUserSubscriptionRepositoryInterface'
 import { UserRepositoryInterface } from '../User/UserRepositoryInterface'
 import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
-import { AnalyticsActivity, AnalyticsStoreInterface, Period } from '@standardnotes/analytics'
+import { UserSubscription } from '../Subscription/UserSubscription'
 
 @injectable()
 export class SubscriptionCancelledEventHandler implements DomainEventHandlerInterface {
@@ -17,6 +24,7 @@ export class SubscriptionCancelledEventHandler implements DomainEventHandlerInte
     @inject(TYPES.UserRepository) private userRepository: UserRepositoryInterface,
     @inject(TYPES.GetUserAnalyticsId) private getUserAnalyticsId: GetUserAnalyticsId,
     @inject(TYPES.AnalyticsStore) private analyticsStore: AnalyticsStoreInterface,
+    @inject(TYPES.StatisticsStore) private statisticsStore: StatisticsStoreInterface,
   ) {}
   async handle(event: SubscriptionCancelledEvent): Promise<void> {
     if (event.payload.offline) {
@@ -35,6 +43,17 @@ export class SubscriptionCancelledEventHandler implements DomainEventHandlerInte
         Period.ThisWeek,
         Period.ThisMonth,
       ])
+
+      const subscriptions = await this.userSubscriptionRepository.findBySubscriptionId(event.payload.subscriptionId)
+      if (subscriptions.length !== 0) {
+        const lastSubscription = subscriptions.shift()
+        const subscriptionLength = event.payload.timestamp - (lastSubscription as UserSubscription).createdAt
+        await this.statisticsStore.incrementMeasure(StatisticsMeasure.SubscriptionLength, subscriptionLength, [
+          Period.Today,
+          Period.ThisWeek,
+          Period.ThisMonth,
+        ])
+      }
     }
   }
 

packages/auth/src/Infra/MySQL/MySQLUserSubscriptionRepository.spec.ts

@@ -157,6 +157,7 @@ describe('MySQLUserSubscriptionRepository', () => {
     ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => selectQueryBuilder)
 
     selectQueryBuilder.where = jest.fn().mockReturnThis()
+    selectQueryBuilder.orderBy = jest.fn().mockReturnThis()
     selectQueryBuilder.getMany = jest.fn().mockReturnValue([subscription])
 
     const result = await createRepository().findBySubscriptionId(123)
@@ -164,6 +165,7 @@ describe('MySQLUserSubscriptionRepository', () => {
     expect(selectQueryBuilder.where).toHaveBeenCalledWith('subscription_id = :subscriptionId', {
       subscriptionId: 123,
     })
+    expect(selectQueryBuilder.orderBy).toHaveBeenCalledWith('created_at', 'DESC')
     expect(selectQueryBuilder.getMany).toHaveBeenCalled()
     expect(result).toEqual([subscription])
   })

packages/auth/src/Infra/MySQL/MySQLUserSubscriptionRepository.ts

@@ -44,6 +44,7 @@ export class MySQLUserSubscriptionRepository implements UserSubscriptionReposito
       .where('subscription_id = :subscriptionId', {
         subscriptionId,
       })
+      .orderBy('created_at', 'DESC')
       .getMany()
   }
 

packages/common/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.31.0](https://github.com/standardnotes/server/compare/@standardnotes/common@1.30.0...@standardnotes/common@1.31.0) (2022-09-05)
+
+### Features
+
+* **auth:** add keeping stats on payments ([0c176b7](https://github.com/standardnotes/server/commit/0c176b70f8281e1e490224b9c7ab85f272a3d4e9))
+
 # [1.30.0](https://github.com/standardnotes/server/compare/@standardnotes/common@1.29.0...@standardnotes/common@1.30.0) (2022-07-14)
 
 ### Features

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/common",
-  "version": "1.30.0",
+  "version": "1.31.0",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -23,7 +23,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest spec --coverage"
+    "test": "jest spec --coverage"
   },
   "devDependencies": {
     "@types/jest": "^28.1.4",

packages/domain-events-infra/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.8.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.7.37...@standardnotes/domain-events-infra@1.8.0) (2022-09-05)
+
+### Features
+
+* **auth:** add keeping stats on payments ([0c176b7](https://github.com/standardnotes/server/commit/0c176b70f8281e1e490224b9c7ab85f272a3d4e9))
+
+## [1.7.37](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.7.36...@standardnotes/domain-events-infra@1.7.37) (2022-09-05)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
+## [1.7.36](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.7.35...@standardnotes/domain-events-infra@1.7.36) (2022-09-01)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
 ## [1.7.35](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.7.34...@standardnotes/domain-events-infra@1.7.35) (2022-09-01)
 
 **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.7.35",
+  "version": "1.8.0",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -21,7 +21,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest spec --coverage"
+    "test": "jest spec --coverage"
   },
   "dependencies": {
     "@standardnotes/domain-events": "workspace:*",

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.57.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.56.0...@standardnotes/domain-events@2.57.0) (2022-09-05)
+
+### Features
+
+* **auth:** add keeping stats on payments ([0c176b7](https://github.com/standardnotes/server/commit/0c176b70f8281e1e490224b9c7ab85f272a3d4e9))
+
+# [2.56.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.55.1...@standardnotes/domain-events@2.56.0) (2022-09-05)
+
+### Features
+
+* **domain-events:** add amount of dollars to payment success event ([9c2d51d](https://github.com/standardnotes/server/commit/9c2d51d718516b550c23637b00a3edead0749425))
+
+## [2.55.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.55.0...@standardnotes/domain-events@2.55.1) (2022-09-01)
+
+### Bug Fixes
+
+* **domain-events:** add admin-panel as event source option ([41c5127](https://github.com/standardnotes/server/commit/41c512798d932859b5d46c6e62fccb89fa288891))
+
 # [2.55.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.54.2...@standardnotes/domain-events@2.55.0) (2022-09-01)
 
 ### Features

packages/domain-events/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/domain-events",
-  "version": "2.55.0",
+  "version": "2.57.0",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -21,7 +21,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest spec --coverage --passWithNoTests"
+    "test": "jest spec --coverage --passWithNoTests"
   },
   "dependencies": {
     "@standardnotes/common": "workspace:*",

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

@@ -1,4 +1,5 @@
 export enum DomainEventService {
+  AdminPanel = 'admin-panel',
   Auth = 'auth',
   SyncingServer = 'syncing-server',
   Payments = 'payments',

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

@@ -1,3 +1,4 @@
 export interface PaymentSuccessEventPayload {
   userEmail: string
+  amount: number
 }

packages/event-store/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.
 
+## [1.3.2](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.3.1...@standardnotes/event-store@1.3.2) (2022-09-05)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.3.1](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.3.0...@standardnotes/event-store@1.3.1) (2022-09-05)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+# [1.3.0](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.2.3...@standardnotes/event-store@1.3.0) (2022-09-02)
+
+### Features
+
+* **event-store:** add listening to subscription reverts ([ef1e2bb](https://github.com/standardnotes/server/commit/ef1e2bb5edb6df191d22a676e365aed3511b3960))
+
+## [1.2.3](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.2.2...@standardnotes/event-store@1.2.3) (2022-09-01)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
 ## [1.2.2](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.2.1...@standardnotes/event-store@1.2.2) (2022-09-01)
 
 **Note:** Version bump only for package @standardnotes/event-store

packages/event-store/package.json

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

packages/event-store/src/Bootstrap/Container.ts

@@ -79,6 +79,7 @@ export class ContainerConfigLoader {
       ['PAYMENT_FAILED', container.get(TYPES.EventHandler)],
       ['PAYMENT_SUCCESS', container.get(TYPES.EventHandler)],
       ['ACCOUNT_CLAIM_REQUESTED', container.get(TYPES.EventHandler)],
+      ['SUBSCRIPTION_REVERT_REQUESTED', container.get(TYPES.EventHandler)],
     ])
 
     container

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.5.41](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.5.40...@standardnotes/files-server@1.5.41) (2022-09-05)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.5.40](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.5.39...@standardnotes/files-server@1.5.40) (2022-09-05)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.5.39](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.5.38...@standardnotes/files-server@1.5.39) (2022-09-01)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
 ## [1.5.38](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.5.37...@standardnotes/files-server@1.5.38) (2022-09-01)
 
 **Note:** Version bump only for package @standardnotes/files-server

packages/files/package.json

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

packages/predicates/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.4.0](https://github.com/standardnotes/server/compare/@standardnotes/predicates@1.3.0...@standardnotes/predicates@1.4.0) (2022-09-05)
+
+### Features
+
+* **auth:** add keeping stats on payments ([0c176b7](https://github.com/standardnotes/server/commit/0c176b70f8281e1e490224b9c7ab85f272a3d4e9))
+
 # [1.3.0](https://github.com/standardnotes/server/compare/@standardnotes/predicates@1.2.6...@standardnotes/predicates@1.3.0) (2022-07-25)
 
 ### Features

packages/predicates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/predicates",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -23,7 +23,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest spec --coverage --passWithNoTests"
+    "test": "jest spec --coverage --passWithNoTests"
   },
   "devDependencies": {
     "@types/jest": "^28.1.4",

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.10.18](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.10.17...@standardnotes/scheduler-server@1.10.18) (2022-09-05)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.10.17](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.10.16...@standardnotes/scheduler-server@1.10.17) (2022-09-05)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.10.16](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.10.15...@standardnotes/scheduler-server@1.10.16) (2022-09-01)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
 ## [1.10.15](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.10.14...@standardnotes/scheduler-server@1.10.15) (2022-09-01)
 
 **Note:** Version bump only for package @standardnotes/scheduler-server

packages/scheduler/package.json

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

packages/security/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.3.0](https://github.com/standardnotes/server/compare/@standardnotes/security@1.2.6...@standardnotes/security@1.3.0) (2022-09-05)
+
+### Features
+
+* **auth:** add keeping stats on payments ([0c176b7](https://github.com/standardnotes/server/commit/0c176b70f8281e1e490224b9c7ab85f272a3d4e9))
+
 ## [1.2.6](https://github.com/standardnotes/server/compare/@standardnotes/security@1.2.5...@standardnotes/security@1.2.6) (2022-07-14)
 
 **Note:** Version bump only for package @standardnotes/security

packages/security/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/security",
-  "version": "1.2.6",
+  "version": "1.3.0",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -23,7 +23,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest spec --coverage"
+    "test": "jest spec --coverage"
   },
   "dependencies": {
     "@standardnotes/common": "workspace:*",

packages/sncrypto-node/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.11.0](https://github.com/standardnotes/server/compare/@standardnotes/sncrypto-node@1.10.1...@standardnotes/sncrypto-node@1.11.0) (2022-09-05)
+
+### Features
+
+* **auth:** add keeping stats on payments ([0c176b7](https://github.com/standardnotes/server/commit/0c176b70f8281e1e490224b9c7ab85f272a3d4e9))
+
 ## [1.10.1](https://github.com/standardnotes/server/compare/@standardnotes/sncrypto-node@1.10.0...@standardnotes/sncrypto-node@1.10.1) (2022-07-12)
 
 **Note:** Version bump only for package @standardnotes/sncrypto-node

packages/sncrypto-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/sncrypto-node",
-  "version": "1.10.1",
+  "version": "1.11.0",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -21,7 +21,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest spec"
+    "test": "jest spec"
   },
   "dependencies": {
     "@standardnotes/sncrypto-common": "^1.9.0",

packages/syncing-server/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.57](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.6.56...@standardnotes/syncing-server@1.6.57) (2022-09-05)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.6.56](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.6.55...@standardnotes/syncing-server@1.6.56) (2022-09-05)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.6.55](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.6.54...@standardnotes/syncing-server@1.6.55) (2022-09-05)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.6.54](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.6.53...@standardnotes/syncing-server@1.6.54) (2022-09-05)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.6.53](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.6.52...@standardnotes/syncing-server@1.6.53) (2022-09-01)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
 ## [1.6.52](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.6.51...@standardnotes/syncing-server@1.6.52) (2022-09-01)
 
 **Note:** Version bump only for package @standardnotes/syncing-server

packages/syncing-server/package.json

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

packages/time/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.10.0](https://github.com/standardnotes/server/compare/@standardnotes/time@1.9.1...@standardnotes/time@1.10.0) (2022-09-05)
+
+### Features
+
+* **auth:** add keeping stats on payments ([0c176b7](https://github.com/standardnotes/server/commit/0c176b70f8281e1e490224b9c7ab85f272a3d4e9))
+
 ## [1.9.1](https://github.com/standardnotes/server/compare/@standardnotes/time@1.9.0...@standardnotes/time@1.9.1) (2022-07-12)
 
 **Note:** Version bump only for package @standardnotes/time

packages/time/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/time",
-  "version": "1.9.1",
+  "version": "1.10.0",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -21,7 +21,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest spec --coverage"
+    "test": "jest spec --coverage"
   },
   "dependencies": {
     "dayjs": "^1.10.8",