From 721ffa4708cb8df7b4df70caaa3c2680f4952148 Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Thu, 19 Nov 2026 11:47:39 +1100 Subject: [PATCH 1/2] Start SpaceTech analytics on the November 5 campaign launch --- infrastructure/analytics-api/README.md | 4 +- infrastructure/analytics-api/src/handler.py | 9 +++- .../analytics-api/tests/test_handler.py | 27 +++++++---- .../analytics-api/tests/test_spacetech_sql.py | 48 ++++++++++--------- src/apps/analytics/README.md | 3 +- .../src/pages/SpaceTechAnalyticsPage.spec.tsx | 44 ++++++++++++++--- .../src/pages/SpaceTechAnalyticsPage.tsx | 13 +++-- .../src/pages/SpaceTechDashboard.spec.tsx | 4 +- .../src/pages/SpaceTechDashboard.tsx | 2 +- 9 files changed, 107 insertions(+), 47 deletions(-) diff --git a/infrastructure/analytics-api/README.md b/infrastructure/analytics-api/README.md index a13469bea..1191db0c5 100644 --- a/infrastructure/analytics-api/README.md +++ b/infrastructure/analytics-api/README.md @@ -171,7 +171,9 @@ parameter remains accepted for API compatibility, but content no longer splits campaign rows or appears in the UI. Distinct visitors are recomputed across all content values, rather than summing distinct counts. `filterOptions` contains available source/medium/campaign values for the date range independently of -selected UTM filters. The SpaceTech tab defaults to 90 days. +selected UTM filters. The campaign starts on November 5, 2026 at 00:00 UTC. +Overlapping requests use that date as their earliest start. Requests ending +before launch return HTTP 400. The SpaceTech tab defaults to up to 90 days. The API retains its JWT/analytics-role gate, parameterized queries, 60-second cache and resumable-query protocol. `dataThrough` is now the UTC timestamp of diff --git a/infrastructure/analytics-api/src/handler.py b/infrastructure/analytics-api/src/handler.py index e297272fb..2a9d24685 100644 --- a/infrastructure/analytics-api/src/handler.py +++ b/infrastructure/analytics-api/src/handler.py @@ -20,6 +20,7 @@ MAX_DATE_RANGE_DAYS = 366 +SPACETECH_CAMPAIGN_START = "2026-11-05" MAX_RESULT_ROWS = 2_000 MAX_QUERY_ATTEMPTS = 2 REPORT_CACHE_SECONDS = 60 @@ -377,7 +378,7 @@ """ -SPACETECH_SQL = """ +SPACETECH_SQL = f""" WITH form_events AS ( SELECT * FROM topcoder_web.spacetech_form_events_v1 WHERE event_timestamp >= CAST(:from_date AS timestamp) @@ -426,7 +427,8 @@ FROM events ) SELECT 'summary'::varchar AS row_type, NULL::varchar AS dimension_1, NULL::varchar AS dimension_2, NULL::varchar AS dimension_3, - (SELECT MAX(event_timestamp)::varchar FROM topcoder_web.spacetech_events_mv_v2) AS dimension_4, + (SELECT MAX(event_timestamp)::varchar FROM topcoder_web.spacetech_events_mv_v2 + WHERE event_timestamp >= TIMESTAMP '{SPACETECH_CAMPAIGN_START}') AS dimension_4, COUNT(CASE WHEN event_name = '_page_view' THEN 1 END)::bigint AS page_views, COUNT(DISTINCT CASE WHEN event_name = '_page_view' THEN analytics_user_id END)::bigint AS visitors, @@ -941,6 +943,9 @@ def handler(event: dict[str, Any], context: Any) -> dict[str, Any]: key: _safe_filter(query.get(key), key) for key in ("source", "medium", "campaign", "content") }} + if filters["to"] < SPACETECH_CAMPAIGN_START: + raise ValueError(f"SpaceTech reporting starts on {SPACETECH_CAMPAIGN_START}") + filters["from"] = max(filters["from"], SPACETECH_CAMPAIGN_START) report = _cached_report( f"spacetech:{json.dumps(filters, sort_keys=True)}", REPORT_CACHE_SECONDS, diff --git a/infrastructure/analytics-api/tests/test_handler.py b/infrastructure/analytics-api/tests/test_handler.py index 3f40e0402..71e94290d 100644 --- a/infrastructure/analytics-api/tests/test_handler.py +++ b/infrastructure/analytics-api/tests/test_handler.py @@ -8,6 +8,7 @@ import sys import types import unittest +from datetime import datetime, timezone from pathlib import Path from unittest.mock import Mock, patch @@ -119,7 +120,7 @@ def test_spacetech_report_attribution_rates_and_quiet_days(self) -> None: rows = [ {"row_type": "summary", "page_views": 20, "visitors": 10, "starts": 5, "submissions": 2, "reached": 7, "engagement_ms": 100000}, - {"row_type": "daily", "dimension_1": "2026-09-01", "visitors": 10, "submissions": 2}, + {"row_type": "daily", "dimension_1": "2026-11-05", "visitors": 10, "submissions": 2}, {"row_type": "campaign", "dimension_1": "linkedin", "dimension_2": "social", "dimension_3": "customer_spacetech_nov26_george", "dimension_4": "post_1", "visitors": 10, "submissions": 2}, @@ -128,7 +129,7 @@ def test_spacetech_report_attribution_rates_and_quiet_days(self) -> None: {"row_type": "option_source", "dimension_1": "email"}, {"row_type": "option_source", "dimension_1": "linkedin"}, ] - query = {"from": "2026-09-01", "to": "2026-09-03", "source": "linkedin", "content": "post_1"} + query = {"from": "2026-11-01", "to": "2026-11-07", "source": "linkedin", "content": "post_1"} with patch.object(self.module, "_execute_query", return_value=rows) as execute: response = self.module.handler(self._event("GET /v1/analytics/spacetech", ["analytics"], query), None) self.assertEqual(response["statusCode"], 200) @@ -143,23 +144,26 @@ def test_spacetech_report_attribution_rates_and_quiet_days(self) -> None: self.assertEqual(report["countries"][0]["country"], "") self.assertNotIn("analytics_user_id", response["body"]) params = {item["name"]: item["value"] for item in execute.call_args.args[1]} + self.assertEqual(params["from_date"], "2026-11-05") + self.assertEqual(report["filters"]["from"], "2026-11-05") + self.assertEqual(report["series"][0]["date"], "2026-11-05") self.assertEqual(params["source"], "linkedin") self.assertEqual(params["content"], "post_1") self.assertIn(":content", execute.call_args.args[0]) self.assertNotIn("linkedin", execute.call_args.args[0]) def test_spacetech_form_activity_excludes_identifiers_and_answers(self) -> None: - rows = [{"row_type": kind, "dimension_1": "2026-11-04 12:00:00", + rows = [{"row_type": kind, "dimension_1": "2026-11-05 12:00:00", "dimension_2": "linkedin", "dimension_3": "social", "dimension_4": "campaign", "visitor_id": "private", "session_id": "private", "email": "private"} for kind in ("form_started", "form_incomplete")] with patch.object(self.module, "_execute_query", return_value=rows): response = self.module.handler(self._event("GET /v1/analytics/spacetech", ["analytics"], { - "from": "2026-11-04", "to": "2026-11-04", + "from": "2026-11-05", "to": "2026-11-05", }), None) activity = json.loads(response["body"])["formActivity"] self.assertEqual([row["status"] for row in activity], ["Started", "Incomplete"]) - self.assertEqual(activity[0], {"startedAt": "2026-11-04T12:00:00.000Z", "source": "linkedin", + self.assertEqual(activity[0], {"startedAt": "2026-11-05T12:00:00.000Z", "source": "linkedin", "medium": "social", "campaign": "campaign", "status": "Started"}) self.assertNotIn("private", response["body"]) @@ -193,9 +197,11 @@ def test_spacetech_persona_totals_and_weekly_rates(self) -> None: def test_spacetech_empty_personas_cover_maximum_range(self) -> None: """All four sources and up to 54 Monday buckets remain bounded for 366 days.""" - with patch.object(self.module, "_execute_query", return_value=[]): + with patch.object(self.module, "datetime", wraps=datetime) as clock, \ + patch.object(self.module, "_execute_query", return_value=[]): + clock.now.return_value = datetime(2027, 11, 8, tzinfo=timezone.utc) response = self.module.handler(self._event("GET /v1/analytics/spacetech", ["analytics"], { - "from": "2025-11-02", "to": "2026-11-02", + "from": "2026-11-08", "to": "2027-11-08", }), None) report = json.loads(response["body"]) self.assertEqual(len(report["personas"]), 4) @@ -253,8 +259,13 @@ def test_spacetech_empty_report_and_authorization(self) -> None: }), None) self.assertEqual(invalid["statusCode"], 400) execute.assert_not_called() + before_launch = self.module.handler(self._event("GET /v1/analytics/spacetech", ["analytics"], { + "to": "2026-11-04", + }), None) + self.assertEqual(before_launch["statusCode"], 400) + execute.assert_not_called() response = self.module.handler(self._event("GET /v1/analytics/spacetech", ["analytics"], { - "from": "2026-09-01", "to": "2026-09-01", + "to": "2026-11-05", }), None) report = json.loads(response["body"]) self.assertEqual(report["totals"]["submissionRate"], 0) diff --git a/infrastructure/analytics-api/tests/test_spacetech_sql.py b/infrastructure/analytics-api/tests/test_spacetech_sql.py index e97bd0429..7bdcba9c7 100644 --- a/infrastructure/analytics-api/tests/test_spacetech_sql.py +++ b/infrastructure/analytics-api/tests/test_spacetech_sql.py @@ -26,7 +26,7 @@ def setUp(self): event_timestamp TIMESTAMP, visitor_id VARCHAR, session_id VARCHAR, event_name VARCHAR, source VARCHAR, medium VARCHAR, campaign VARCHAR, content VARCHAR )""") - self.params = dict(from_date="2026-11-04", to_date="2026-11-17", + self.params = dict(from_date="2026-11-05", to_date="2026-11-17", source="*", medium="*", campaign="*", content="*") def tearDown(self): @@ -53,15 +53,17 @@ def report(self): return self.handler._spacetech_report(filters, None) def test_distinct_personas_rates_week_boundaries_and_filters(self): + self.event("2026-11-04 23:59:59", "before", source="pre-launch") + self.assertIsNone(self.report()["dataThrough"]) # Same person visits different links/sources/days/weeks: totals must deduplicate. - self.event("2026-11-04", "one") + self.event("2026-11-05", "one") self.event("2026-11-08 23:59:59", "one", source="linkedin", medium="social", content="other") self.event("2026-11-09", "one") self.event("2026-11-09", "two") for event in ("form_started", "form_completed", "form_section_reached"): - self.event("2026-11-04", "one", event=event) + self.event("2026-11-05", "one", event=event) self.event("2026-11-09", "one", event=event) - self.event("2026-11-04", "one", event="_user_engagement", engagement=31000) + self.event("2026-11-05", "one", event="_user_engagement", engagement=31000) # Other personas, uppercase naming, suffixes, and unknown campaigns. self.event("2026-11-05", "one", persona="ANITA") self.event("2026-11-05", "three", persona="tony") @@ -70,10 +72,10 @@ def test_distinct_personas_rates_week_boundaries_and_filters(self): self.event("2026-11-05", "six", campaign="", source="topcoder", medium="anita") self.event("2026-11-05", "seven", campaign="other_spacetech_nov26_george") self.event("2026-11-05", "eight", campaign="customer_spacetech_nov26_unknown_george") - # Both edges are excluded despite sharing a week with included dates. - self.event("2026-11-03 23:59:59", "outside") + # The day after the range is excluded despite sharing the final week. self.event("2026-11-18", "outside") report = self.report() + self.assertNotIn("pre-launch", report["filterOptions"]["source"]) george = report["personas"][1] self.assertEqual((george["pageViews"], george["visitors"], george["starts"], george["submissions"], george["reached"], george["submissionRate"], george["averageEngagementSeconds"]), @@ -95,8 +97,8 @@ def test_empty_and_zero_denominators(self): report = self.report() self.assertEqual(len(report["personas"]), 4) self.assertEqual(len(report["personaSeries"]), 3) - self.event("2026-11-04", "one", event="form_completed") - self.event("2026-11-04", "one", event="_user_engagement", engagement=10000) + self.event("2026-11-05", "one", event="form_completed") + self.event("2026-11-05", "one", event="_user_engagement", engagement=10000) george = self.report()["personas"][1] self.assertEqual(george["submissions"], 1) self.assertEqual(george["submissionRate"], 0) @@ -107,21 +109,21 @@ def form_event(self, time, visitor, event, session="session", source="email", ca [time, visitor, session, event, source, "social", campaign, "post"]) def test_form_status_lifecycle_repeat_attempts_and_private_fields(self): - self.form_event("2026-11-04 10:00:00", "started", "form_started") - self.form_event("2026-11-04 11:00:00", "incomplete", "form_started") - self.form_event("2026-11-04 11:01:00", "incomplete", "form_abandoned") + self.form_event("2026-11-05 10:00:00", "started", "form_started") + self.form_event("2026-11-05 11:00:00", "incomplete", "form_started") + self.form_event("2026-11-05 11:01:00", "incomplete", "form_abandoned") # A completion wins even if a pagehide abandonment arrived first. - self.form_event("2026-11-04 12:00:00", "completed", "form_started") - self.form_event("2026-11-04 12:01:00", "completed", "form_abandoned") - self.form_event("2026-11-04 12:02:00", "completed", "form_completed") + self.form_event("2026-11-05 12:00:00", "completed", "form_started") + self.form_event("2026-11-05 12:01:00", "completed", "form_abandoned") + self.form_event("2026-11-05 12:02:00", "completed", "form_completed") # A later successful attempt must not erase a previous incomplete one. - self.form_event("2026-11-04 13:00:00", "repeat", "form_started") - self.form_event("2026-11-04 13:01:00", "repeat", "form_abandoned") - self.form_event("2026-11-04 14:00:00", "repeat", "form_started") - self.form_event("2026-11-04 14:01:00", "repeat", "form_completed") - self.form_event("2026-11-04 15:00:00", "repeat", "form_started") + self.form_event("2026-11-05 13:00:00", "repeat", "form_started") + self.form_event("2026-11-05 13:01:00", "repeat", "form_abandoned") + self.form_event("2026-11-05 14:00:00", "repeat", "form_started") + self.form_event("2026-11-05 14:01:00", "repeat", "form_completed") + self.form_event("2026-11-05 15:00:00", "repeat", "form_started") # Same visitor, different session: must not suppress the unsubmitted attempt. - self.form_event("2026-11-04 15:01:00", "repeat", "form_completed", session="other") + self.form_event("2026-11-05 15:01:00", "repeat", "form_completed", session="other") activity = self.report()["formActivity"] self.assertEqual(len(activity), 4) self.assertEqual(sorted(row["status"] for row in activity), @@ -137,10 +139,10 @@ def test_form_status_date_and_attribution_filters_do_not_hide_terminal_events(se self.form_event("2026-11-18 00:01:00", "complete", "form_completed", source="changed") self.form_event("2026-11-17 23:59:00", "left", "form_started") self.form_event("2026-11-18 00:01:00", "left", "form_abandoned", source="changed") - self.form_event("2026-11-03 23:59:00", "before", "form_started") + self.form_event("2026-11-04 23:59:00", "before", "form_started") self.form_event("2026-11-18 00:00:00", "after", "form_started") - self.form_event("2026-11-04 00:00:00", "other-source", "form_started", source="linkedin") - self.form_event("2026-11-04 00:00:00", "other-campaign", "form_started", campaign="other") + self.form_event("2026-11-05 00:00:00", "other-source", "form_started", source="linkedin") + self.form_event("2026-11-05 00:00:00", "other-campaign", "form_started", campaign="other") self.params.update(source="email", medium="social", campaign="campaign", content="post") self.assertEqual(self.report()["formActivity"], [{ "startedAt": "2026-11-17T23:59:00.000Z", "source": "email", "medium": "social", diff --git a/src/apps/analytics/README.md b/src/apps/analytics/README.md index 1e533e3d1..4c250c43d 100644 --- a/src/apps/analytics/README.md +++ b/src/apps/analytics/README.md @@ -97,7 +97,8 @@ genuine failure, the explicit retry action is shown. SpaceTech Analytics reports `/space-tech` traffic, engagement, FAQ opens, form-section reach and accepted form submissions with source, medium, campaign -dropdown filters. It defaults to 90 days and supports the same 366-day limit. +dropdown filters. Reporting begins on November 5, 2026 (inclusive, UTC). The default covers up to +90 days since launch, and custom ranges support the same 366-day limit. The daily chart compares visitors with form submissions. Lead details appear below the aggregates for users with existing Forms reporting permission, with all-column sorting/filtering and Submitted, Started and Incomplete statuses. Unfinished attempts diff --git a/src/apps/analytics/src/pages/SpaceTechAnalyticsPage.spec.tsx b/src/apps/analytics/src/pages/SpaceTechAnalyticsPage.spec.tsx index 1dd1a0f96..75de7d548 100644 --- a/src/apps/analytics/src/pages/SpaceTechAnalyticsPage.spec.tsx +++ b/src/apps/analytics/src/pages/SpaceTechAnalyticsPage.spec.tsx @@ -40,15 +40,21 @@ const report = { } describe('SpaceTech Analytics', () => { - beforeEach(() => { jest.clearAllMocks(); (getSpaceTechReport as jest.Mock).mockResolvedValue(report) }) + beforeEach(() => { + jest.useFakeTimers() + jest.setSystemTime(new Date('2026-11-19T12:00:00Z')) + jest.clearAllMocks(); + (getSpaceTechReport as jest.Mock).mockResolvedValue(report) + }) + afterEach(() => { jest.useRealTimers() }) - it('loads ninety days and applies every UTM filter together', async () => { + it('loads the campaign from launch and applies every UTM filter together', async () => { render() fireEvent.click(screen.getByRole('tab', { name: 'Details' })) await screen.findByText('Submissions: 2') const initial = (getSpaceTechReport as jest.Mock).mock.calls[0][0] - expect((Date.parse(initial.to) - Date.parse(initial.from)) / 86400000) - .toBe(89) + expect(initial) + .toEqual({ from: '2026-11-05', to: '2026-11-19' }) fireEvent.change(screen.getByLabelText('utm_source'), { target: { value: 'linkedin' } }) fireEvent.change(screen.getByLabelText('utm_medium'), { target: { value: 'social' } }) fireEvent.change(screen.getByLabelText('utm_campaign'), { target: { value: 'george' } }) @@ -66,6 +72,32 @@ describe('SpaceTech Analytics', () => { .toBeInTheDocument() }) + it('retains the rolling 90-day default once the campaign is older', async () => { + jest.setSystemTime(new Date('2027-03-01T00:00:00Z')) + render() + await screen.findByText(/Latest processed event/) + expect(getSpaceTechReport) + .toHaveBeenCalledWith({ from: '2026-12-02', to: '2027-03-01' }) + }) + + it('prevents requests for pre-launch dates', async () => { + render() + await screen.findByText(/Latest processed event/) + const start = screen.getByLabelText('Start date') + expect(start) + .toHaveAttribute('min', '2026-11-05') + expect(screen.getByLabelText('End date')) + .toHaveAttribute('min', '2026-11-05') + fireEvent.change(start, { target: { value: '2026-11-04' } }) + expect(start) + .toBeInvalid() + fireEvent.submit(start.closest('form') as HTMLFormElement) + expect(screen.getByRole('alert')) + .toHaveTextContent('Choose a start date on or after November 5, 2026.') + expect(getSpaceTechReport) + .toHaveBeenCalledTimes(1) + }) + it('clears applied filters and invalid draft dates and reloads the default report', async () => { render() expect(await screen.findByText(/Latest processed event/)) @@ -108,8 +140,8 @@ describe('SpaceTech Analytics', () => { const retry = await screen.findByRole('button', { name: 'Analytics data could not be loaded. Try again.' }) fireEvent.click(retry) await screen.findByText('Submissions: 2') - fireEvent.change(screen.getByLabelText('Start date'), { target: { value: '2026-10-10' } }) - fireEvent.change(screen.getByLabelText('End date'), { target: { value: '2026-10-01' } }) + fireEvent.change(screen.getByLabelText('Start date'), { target: { value: '2026-11-10' } }) + fireEvent.change(screen.getByLabelText('End date'), { target: { value: '2026-11-09' } }) fireEvent.click(screen.getByRole('button', { name: 'Apply filters' })) expect(screen.getByRole('alert')) .toHaveTextContent('The start date must not be after the end date.') diff --git a/src/apps/analytics/src/pages/SpaceTechAnalyticsPage.tsx b/src/apps/analytics/src/pages/SpaceTechAnalyticsPage.tsx index 220e08041..4d8d22ea2 100644 --- a/src/apps/analytics/src/pages/SpaceTechAnalyticsPage.tsx +++ b/src/apps/analytics/src/pages/SpaceTechAnalyticsPage.tsx @@ -14,6 +14,7 @@ import { SpaceTechDashboard, spaceTechMetrics as metrics } from './SpaceTechDash import SpaceTechLeads from './SpaceTechLeads' import styles from './AnalyticsPages.module.scss' +const campaignStart = '2026-11-05' const series = [ { color: '#2c5de5', key: 'visitors', label: 'Unique visitors' }, { color: '#137d60', key: 'submissions', label: 'Form submissions' }, @@ -59,14 +60,14 @@ const Breakdown: FC<{ title: string; rows: SpaceTechGroup[]; columns: string[][] ) -/** SpaceTech opens on the last 90 UTC calendar days with all attribution values included. */ +/** SpaceTech opens on up to 90 UTC calendar days of campaign activity. */ function defaultSpaceTechFilters(): SpaceTechFilters { const to = defaultAnalyticsDateRange().to const start = new Date(`${to}T00:00:00Z`) start.setUTCDate(start.getUTCDate() - 89) const from = start.toISOString() .slice(0, 10) - return { from, to } + return { from: from < campaignStart ? campaignStart : from, to } } /** Shows UTM-attributed SpaceTech traffic, engagement, and accepted form submissions. */ @@ -124,12 +125,17 @@ export const SpaceTechAnalyticsPage: FC = () => { ))} -

Traffic and accepted form submissions for /space-tech. Dates are inclusive and use UTC.

+

+ Traffic and accepted form submissions for /space-tech since November 5, 2026. + Dates are inclusive and use UTC. +

{ event.preventDefault() const validation = validateAnalyticsDateRange(draft) + || (draft.from < campaignStart + ? 'Choose a start date on or after November 5, 2026.' : undefined) setError(validation) if (!validation) applyFilters(draft) }} @@ -138,6 +144,7 @@ export const SpaceTechAnalyticsPage: FC = () => {