Skip to content

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

feat: add dataroomId to tinybird datasource

Marc Seitzd0df6396bffc
diff --git a/lib/tinybird/datasources/page_views.datasource b/lib/tinybird/datasources/page_views.datasource
index 32477b7d..af15bb6d 100644
--- a/lib/tinybird/datasources/page_views.datasource
+++ b/lib/tinybird/datasources/page_views.datasource
@@ -1,4 +1,4 @@
-VERSION 2
+VERSION 3
DESCRIPTION >
Page views are events when a user views a document
@@ -8,6 +8,7 @@ SCHEMA >
`linkId` String `json:$.linkId`,
`documentId` String `json:$.documentId`,
`viewId` String `json:$.viewId`,
+ `dataroomId` 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 13b510fa..39cf66e4 100644
--- a/lib/tinybird/endpoints/tb_backfill_populate.pipe
+++ b/lib/tinybird/endpoints/tb_backfill_populate.pipe
@@ -1,10 +1,8 @@
NODE temp_0
SQL >
- SELECT
- * ,
- 1 AS versionNumber
- FROM page_views__v1
- WHERE fromUnixTimestamp64Milli(time) <= '2023-10-14 19:25:00.000'
+ SELECT *
+ FROM page_views__v2
+ WHERE fromUnixTimestamp64Milli(time) <= '2024-03-27 09:59:00.000'
TYPE materialized
-DATASOURCE page_views__v2
\ No newline at end of file
+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 8940902e..28daabc5 100644
--- a/lib/tinybird/endpoints/tb_materialize_until_change_ingest.pipe
+++ b/lib/tinybird/endpoints/tb_materialize_until_change_ingest.pipe
@@ -1,10 +1,8 @@
NODE temp_0
SQL >
- SELECT
- * ,
- 1 AS versionNumber
- FROM page_views__v1
- WHERE fromUnixTimestamp64Milli(time) > '2023-10-14 19:25:00.000'
+ SELECT *
+ FROM page_views__v2
+ WHERE fromUnixTimestamp64Milli(time) > '2024-03-27 09:59:00.000'
TYPE materialized
-DATASOURCE page_views__v2
\ No newline at end of file
+DATASOURCE page_views__v3
\ No newline at end of file
diff --git a/lib/tinybird/publish.ts b/lib/tinybird/publish.ts
index 04558613..3918c5fe 100644
--- a/lib/tinybird/publish.ts
+++ b/lib/tinybird/publish.ts
@@ -11,6 +11,7 @@ export const publishPageView = tb.buildIngestEndpoint({
linkId: z.string(),
documentId: z.string(),
viewId: z.string(),
+ folderId: z.string().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 5d021021..3cde8469 100644
--- a/pages/api/record_view.ts
+++ b/pages/api/record_view.ts
@@ -13,6 +13,7 @@ const bodyValidation = z.object({
linkId: z.string(),
documentId: z.string(),
viewId: z.string(),
+ folderId: z.string().optional(),
versionNumber: z.number().int().optional(),
time: z.number().int(),
duration: z.number().int(),
@@ -54,15 +55,23 @@ export default async function handle(
const referer = req.headers.referer;
const ua = userAgentFromString(req.headers["user-agent"]);
- const { linkId, documentId, viewId, duration, pageNumber, versionNumber } =
- req.body as {
- linkId: string;
- documentId: string;
- viewId: string;
- duration: number;
- pageNumber: number;
- versionNumber: number;
- };
+ const {
+ linkId,
+ documentId,
+ viewId,
+ dataroomId,
+ duration,
+ pageNumber,
+ versionNumber,
+ } = req.body as {
+ linkId: string;
+ documentId: string;
+ viewId: string;
+ dataroomId: string | undefined;
+ duration: number;
+ pageNumber: number;
+ versionNumber: number;
+ };
const time = Date.now(); // in milliseconds
@@ -73,6 +82,7 @@ export default async function handle(
linkId,
documentId,
viewId,
+ dataroomId,
versionNumber: versionNumber || 1,
time,
duration,
@@ -110,7 +120,11 @@ export default async function handle(
res.status(200).json({ message: "View recorded" });
} catch (error) {
- log({message: `Failed to record view (tinybird) for ${linkId}. \n\n ${error}`, type: "error", mention: true});
+ log({
+ message: `Failed to record view (tinybird) for ${linkId}. \n\n ${error}`,
+ type: "error",
+ mention: true,
+ });
res.status(500).json({ message: (error as Error).message });
}
}