diff --git a/packages/analytics/bin/report.ts b/packages/analytics/bin/report.ts index aed8bf7c0..1558bdfd6 100644 --- a/packages/analytics/bin/report.ts +++ b/packages/analytics/bin/report.ts @@ -29,7 +29,6 @@ const requestReport = async ( calculateMonthlyRecurringRevenue: CalculateMonthlyRecurringRevenue, timer: TimerInterface, adminEmails: string[], - logger: Logger, ): Promise => { await calculateMonthlyRecurringRevenue.execute({}) @@ -134,7 +133,6 @@ const requestReport = async ( counts: await statisticsStore.calculateTotalCountOverPeriod(statisticName, Period.Last30DaysIncludingToday), }) } - logger.info('Calculated thirty days statistics: %O', statisticsOverTime) const monthlyStatisticsNames = [StatisticMeasureName.NAMES.MRR] for (const statisticName of monthlyStatisticsNames) { @@ -284,7 +282,6 @@ void container.load().then((container) => { calculateMonthlyRecurringRevenue, timer, adminEmails, - logger, ), ) .then(() => { diff --git a/packages/analytics/src/Domain/Email/daily-analytics-report.html.ts b/packages/analytics/src/Domain/Email/daily-analytics-report.html.ts index dc0a1c170..44fcad706 100644 --- a/packages/analytics/src/Domain/Email/daily-analytics-report.html.ts +++ b/packages/analytics/src/Domain/Email/daily-analytics-report.html.ts @@ -6,24 +6,18 @@ import { StatisticMeasureName } from '../Statistics/StatisticMeasureName' import { Period } from '../Time/Period' const countActiveUsers = (measureName: string, data: any): { yesterday: number; last30Days: number } => { - const totalActiveUsersLast30DaysIncludingToday = data.statisticMeasures.find( + const totalActiveUsersLast30DaysIncludingToday = data.statisticsOverTime.find( (a: { name: string; period: number }) => a.name === measureName && a.period === 27, ) - // eslint-disable-next-line no-console - console.log(totalActiveUsersLast30DaysIncludingToday) const totalActiveUsersYesterday = totalActiveUsersLast30DaysIncludingToday.counts[totalActiveUsersLast30DaysIncludingToday.counts.length - 2] .totalCount - // eslint-disable-next-line no-console - console.log(totalActiveUsersYesterday) - const filteredCounts = totalActiveUsersLast30DaysIncludingToday.counts.filter( (count: { totalCount: number }) => count.totalCount !== 0, ) - // eslint-disable-next-line no-console - console.log(filteredCounts) + const averageActiveUsersLast30Days = Math.floor( filteredCounts.reduce((previousValue: { totalCount: any }, currentValue: { totalCount: any }) => { return previousValue.totalCount + currentValue.totalCount