Skip to content

Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.

hot fix(resolved): migrate events to datasource v3

Marc Seitz7c483262011c
diff --git a/lib/tinybird/datasources/page_views.datasource b/lib/tinybird/datasources/page_views.datasource
index af15bb6d..6f09266d 100644
--- a/lib/tinybird/datasources/page_views.datasource
+++ b/lib/tinybird/datasources/page_views.datasource
@@ -8,7 +8,7 @@ SCHEMA >
`linkId` String `json:$.linkId`,
`documentId` String `json:$.documentId`,
`viewId` String `json:$.viewId`,
- `dataroomId` String `json:$.dataroomId`,
+ `dataroomId` Nullable(String) `json:$.dataroomId`,
`versionNumber` UInt16 `json:$.versionNumber`,
# Unix timestamp
`time` Int64 `json:$.time`,
diff --git a/lib/tinybird/endpoints/tb_backfill_populate.pipe b/lib/tinybird/endpoints/tb_backfill_populate.pipe
index 23fda24d..43a8b635 100644
--- a/lib/tinybird/endpoints/tb_backfill_populate.pipe
+++ b/lib/tinybird/endpoints/tb_backfill_populate.pipe
@@ -1,8 +1,10 @@
NODE temp_0
SQL >
- SELECT *
+ SELECT
+ * ,
+ CAST(NULL AS Nullable(String)) AS dataroomId
FROM page_views__v2
- WHERE fromUnixTimestamp64Milli(time) <= '2024-04-02 07:08:00.000'
+ WHERE fromUnixTimestamp64Milli(time) <= '2024-04-02 08:52:00.000'
TYPE materialized
DATASOURCE page_views__v3
\ No newline at end of file
diff --git a/lib/tinybird/endpoints/tb_materialize_until_change_ingest.pipe b/lib/tinybird/endpoints/tb_materialize_until_change_ingest.pipe
index 1bd70cf5..74f6267c 100644
--- a/lib/tinybird/endpoints/tb_materialize_until_change_ingest.pipe
+++ b/lib/tinybird/endpoints/tb_materialize_until_change_ingest.pipe
@@ -1,8 +1,10 @@
NODE temp_0
SQL >
- SELECT *
+ SELECT
+ * ,
+ CAST(NULL AS Nullable(String)) AS dataroomId
FROM page_views__v2
- WHERE fromUnixTimestamp64Milli(time) > '2024-04-02 07:08:00.000'
+ WHERE fromUnixTimestamp64Milli(time) > '2024-04-02 08:52:00.000'
TYPE materialized
DATASOURCE page_views__v3
\ No newline at end of file
diff --git a/lib/tinybird/pipes.ts b/lib/tinybird/pipes.ts
index 34677434..a226ba37 100644
--- a/lib/tinybird/pipes.ts
+++ b/lib/tinybird/pipes.ts
@@ -5,7 +5,7 @@ import { Tinybird } from "@chronark/zod-bird";
const tb = new Tinybird({ token: process.env.TINYBIRD_TOKEN! });
export const getTotalAvgPageDuration = tb.buildPipe({
- pipe: "get_total_average_page_duration__v3",
+ pipe: "get_total_average_page_duration__v4",
parameters: z.object({
documentId: z.string(),
excludedLinkIds: z.array(z.string()),
@@ -20,7 +20,7 @@ export const getTotalAvgPageDuration = tb.buildPipe({
});
export const getViewPageDuration = tb.buildPipe({
- pipe: "get_page_duration_per_view__v3",
+ pipe: "get_page_duration_per_view__v4",
parameters: z.object({
documentId: z.string(),
viewId: z.string(),
diff --git a/lib/tinybird/publish.ts b/lib/tinybird/publish.ts
index e7621efb..00f8c8b8 100644
--- a/lib/tinybird/publish.ts
+++ b/lib/tinybird/publish.ts
@@ -5,13 +5,13 @@ import { Tinybird } from "@chronark/zod-bird";
const tb = new Tinybird({ token: process.env.TINYBIRD_TOKEN! });
export const publishPageView = tb.buildIngestEndpoint({
- datasource: "page_views__v2",
+ datasource: "page_views__v3",
event: z.object({
id: z.string(),
linkId: z.string(),
documentId: z.string(),
viewId: z.string(),
- // dataroomId: z.string().nullable().optional(),
+ dataroomId: z.string().nullable().optional(),
versionNumber: z.number().int().min(1).max(65535).optional().default(1),
time: z.number().int(),
duration: z.number().int(),
diff --git a/pages/api/record_view.ts b/pages/api/record_view.ts
index 29d58ae7..e0c4db67 100644
--- a/pages/api/record_view.ts
+++ b/pages/api/record_view.ts
@@ -13,7 +13,7 @@ const bodyValidation = z.object({
linkId: z.string(),
documentId: z.string(),
viewId: z.string(),
- // dataroomId: z.string().nullable().optional(),
+ dataroomId: z.string().nullable().optional(),
versionNumber: z.number().int().optional(),
time: z.number().int(),
duration: z.number().int(),
@@ -82,7 +82,7 @@ export default async function handle(
linkId,
documentId,
viewId,
- // dataroomId: dataroomId || null,
+ dataroomId: dataroomId || null,
versionNumber: versionNumber || 1,
time,
duration,