@@ -27,7 +27,7 @@ async function loadUsersByCountry(tenancy: Tenancy, includeAnonymous: boolean =
2727 ON "Event"."endUserIpInfoGuessId" = eip.id
2828 WHERE '$user-activity' = ANY("systemEventTypeIds"::text[])
2929 AND "data"->>'projectId' = ${ tenancy . project . id }
30- AND (${ includeAnonymous } OR NOT "data"->>'isAnonymous' = 'true')
30+ AND (${ includeAnonymous } OR COALESCE( "data"->>'isAnonymous', 'false') ! = 'true')
3131 AND COALESCE("data"->>'branchId', 'main') = ${ tenancy . branchId }
3232 AND "countryCode" IS NOT NULL
3333 ORDER BY "userId", "eventStartedAt" DESC
@@ -87,7 +87,7 @@ async function loadDailyActiveUsers(tenancy: Tenancy, now: Date, includeAnonymou
8787 daily_users AS (
8888 SELECT
8989 DATE_TRUNC('day', "eventStartedAt") AS "day",
90- COUNT(DISTINCT CASE WHEN (${ includeAnonymous } OR "data"->>'isAnonymous' = 'false ') THEN "data"->'userId' ELSE NULL END) AS "dau"
90+ COUNT(DISTINCT CASE WHEN (${ includeAnonymous } OR COALESCE( "data"->>'isAnonymous', 'false') ! = 'true ') THEN "data"->'userId' ELSE NULL END) AS "dau"
9191 FROM "Event"
9292 WHERE "eventStartedAt" >= ${ now } ::date - INTERVAL '30 days'
9393 AND '$user-activity' = ANY("systemEventTypeIds"::text[])
@@ -146,7 +146,7 @@ async function loadRecentlyActiveUsers(tenancy: Tenancy, includeAnonymous: boole
146146 ) as rn
147147 FROM "Event"
148148 WHERE "data"->>'projectId' = ${ tenancy . project . id }
149- AND (${ includeAnonymous } OR NOT "data"->>'isAnonymous' = 'true')
149+ AND (${ includeAnonymous } OR COALESCE( "data"->>'isAnonymous', 'false') ! = 'true')
150150 AND COALESCE("data"->>'branchId', 'main') = ${ tenancy . branchId }
151151 AND '$user-activity' = ANY("systemEventTypeIds"::text[])
152152 )
0 commit comments