From 460d161c7665c0c6ad1f11e6a282c082f2f3a016 Mon Sep 17 00:00:00 2001 From: David Dworken Date: Sun, 15 Oct 2023 14:52:45 -0700 Subject: [PATCH] Update some usage calculations to exclude is_integration_test_device --- backend/server/internal/database/db.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/backend/server/internal/database/db.go b/backend/server/internal/database/db.go index 0358e06..b77f8ce 100644 --- a/backend/server/internal/database/db.go +++ b/backend/server/internal/database/db.go @@ -328,11 +328,13 @@ func (db *DB) GenerateAndStoreActiveUserStats(ctx context.Context) error { return nil } - totalNumDevices, err := extractInt64FromRow(db.WithContext(ctx).Raw("SELECT COUNT(DISTINCT devices.device_id) FROM devices").Row()) + // TODO: Update usage_data queries to reference is_integration_test_device + + totalNumDevices, err := extractInt64FromRow(db.WithContext(ctx).Raw("SELECT COUNT(DISTINCT devices.device_id) FROM devices WHERE NOT is_integration_test_device").Row()) if err != nil { return err } - totalNumUsers, err := extractInt64FromRow(db.WithContext(ctx).Raw("SELECT COUNT(DISTINCT devices.user_id) FROM devices").Row()) + totalNumUsers, err := extractInt64FromRow(db.WithContext(ctx).Raw("SELECT COUNT(DISTINCT devices.user_id) FROM devices WHERE NOT is_integration_test_device").Row()) if err != nil { return err } @@ -352,7 +354,7 @@ func (db *DB) GenerateAndStoreActiveUserStats(ctx context.Context) error { if err != nil { return err } - dailyInstalls, err := extractInt64FromRow(db.WithContext(ctx).Raw("SELECT count(distinct device_id) FROM devices WHERE registration_date > (now()::date-1)::timestamp").Row()) + dailyInstalls, err := extractInt64FromRow(db.WithContext(ctx).Raw("SELECT count(distinct device_id) FROM devices WHERE registration_date > (now()::date-1)::timestamp AND NOT is_integration_test_device").Row()) if err != nil { return err }