Merge pull request #63 from cofacts/add-user-to-events

Add user to events

README.md

@@ -82,7 +82,7 @@ Please manually create dataset, handle permission on Google Cloud, and setup rel
 
 Run the following script to create big query tables under the dataset specified in the environment variable.
 ```
-./node_modules/.bin/babel-node db/createBqTables.ts --extensions .ts,.js
+./node_modules/.bin/babel-node db/setBqTables.ts --extensions .ts,.js
 ```
 
 ---

bq/events.ts

@@ -7,6 +7,7 @@ import { convert } from 'zoq';
 export const TABLE = 'events';
 
 const eventBatchSchema = z.object({
+  userId: z.string().nullable(),
   createdAt: z.date().describe('Time of the event batch is sent'),
   text: z.string().describe('Message text').nullable(),
   messageSource: z.enum(['user', 'group', 'room']).nullable(),

db/setBqTables.ts

@@ -0,0 +1,38 @@
+/**
+ * BigQuery client and schema
+ */
+import 'dotenv/config';
+import { BigQuery } from '@google-cloud/bigquery';
+import type { TableSchema } from '@google-cloud/bigquery';
+import * as bqEvents from '../bq/events';
+
+const bqDataset = new BigQuery().dataset(
+  process.env.BIGQUERY_ANALYTICS_DATASET || ''
+);
+
+async function loadSchema({TABLE, SCHEMA}: {TABLE: string, SCHEMA: TableSchema[]}) {
+  const table = bqDataset.table(TABLE);
+
+  if(await table.exists()) {
+    const [result] = await table.setMetadata({schema: SCHEMA});
+
+    console.log(`Table ${table.id} fields updated to:`, result.schema.fields);
+    return;
+  }
+
+  const [createdTable] = await bqDataset.createTable(TABLE, {
+    schema: SCHEMA,
+    timePartitioning: {
+      type: 'MONTH',
+      field: 'createdAt',
+    },
+  });
+
+  console.log(`Table ${table.id} created under dataset ${createdTable.dataset.id}.`);
+  console.log('You may need to wait up to 2 minutes before seeing it in GCS console.');
+}
+
+loadSchema(bqEvents).catch((e) => {
+  console.error('[setBqTables]', e);
+  process.exit(1);
+});