fix references to custom fields

Author: Dan Lee

includes/page_events.js

@@ -2,8 +2,6 @@ const segmentCommon = require("./common");
 
 module.exports = (params) => {
 
-  
-
   const customPageFieldsObj = params.customPageFields.reduce((acc, item) => ({...acc, [item]: item }), {});
 
   const customTrackFieldsObj = params.customTrackFields.reduce((acc, item) => ({...acc, [item]: item }), {});
@@ -18,7 +16,7 @@ select
   user_id,
   anonymous_id,
   id as page_id,
-  ${Object.entries({...segmentCommon.PAGE_FIELDS, ...segmentCommon.customPageFieldsObj}).map(
+  ${Object.entries({...segmentCommon.PAGE_FIELDS, ...customPageFieldsObj}).map(
       ([key, value]) => `${key} as ${value}`).join(",\n    ")}
 from
   ${ctx.ref(params.segmentSchema, "pages")} as pages

includes/sessionized_events.js

@@ -1,6 +1,7 @@
 const crossdb = require("./crossdb");
 
 module.exports = (params) => {
+
   return publish("segment_sessionized_events", {
     ...params.defaultConfig
   }).query(ctx => `

includes/sessionized_pages.js

@@ -1,6 +1,11 @@
 const segmentCommon = require("./common");
 
 module.exports = (params) => {
+
+  const customPageFieldsObj = params.customPageFields.reduce((acc, item) => ({...acc, [item]: item }), {});
+
+  const customTrackFieldsObj = params.customTrackFields.reduce((acc, item) => ({...acc, [item]: item }), {});
+  
   return publish("segment_sessionized_pages", {
     ...params.defaultConfig
   }).query(ctx => `
@@ -12,7 +17,7 @@ select
   segment_sessionized_events.page_id,
   segment_sessionized_events.session_index,
   segment_sessionized_events.session_id,
-  ${Object.entries({...segmentCommon.PAGE_FIELDS, ...segmentCommon.customPageFieldsObj}).map(
+  ${Object.entries({...segmentCommon.PAGE_FIELDS, ...customPageFieldsObj}).map(
       ([key, value]) => `segment_page_events.${value}`).join(",\n  ")}
 from 
   ${params.segmentSchema, ctx.ref("segment_sessionized_events")} as segment_sessionized_events

includes/sessionized_tracks.js

@@ -1,6 +1,11 @@
 const segmentCommon = require("./common");
 
 module.exports = (params) => {
+
+  const customPageFieldsObj = params.customPageFields.reduce((acc, item) => ({...acc, [item]: item }), {});
+
+  const customTrackFieldsObj = params.customTrackFields.reduce((acc, item) => ({...acc, [item]: item }), {});
+
   return publish("segment_sessionized_tracks", {
     ...params.defaultConfig
   }).query(ctx => `
@@ -12,7 +17,7 @@ select
   segment_sessionized_events.track_id,
   segment_sessionized_events.session_index,
   segment_sessionized_events.session_id,
-  ${Object.entries({...segmentCommon.TRACK_FIELDS, ...segmentCommon.customTrackFieldsObj}).map(
+  ${Object.entries({...segmentCommon.TRACK_FIELDS, ...customTrackFieldsObj}).map(
       ([key, value]) => `segment_track_events.${value}`).join(",\n  ")}
 from 
   ${params.segmentSchema, ctx.ref("segment_sessionized_events")} as segment_sessionized_events

includes/sessions.js

@@ -2,6 +2,11 @@ const segmentCommon = require("./common");
 const crossdb = require("./crossdb");
 
 module.exports = (params) => {
+
+  const customPageFieldsObj = params.customPageFields.reduce((acc, item) => ({...acc, [item]: item }), {});
+
+  const customTrackFieldsObj = params.customTrackFields.reduce((acc, item) => ({...acc, [item]: item }), {});
+
   return publish("segment_sessions", {
     description: "Sessions contain a combined view of tracks and pages from segment. Each session is a period of sustained activity, with a new session starting after a 30min+ period of inactivity. Each session contains a repeated field of records which are either tracks or pages. Common fields are extracted out into the top level and type specific fields are kept within two structs: records.track and records.page",
     columns: {
@@ -16,15 +21,15 @@ module.exports = (params) => {
 with first_and_last_page_values as (
 select distinct
   session_id,
-  ${Object.entries({...segmentCommon.PAGE_FIELDS, ...segmentCommon.customPageFieldsObj}).map(
+  ${Object.entries({...segmentCommon.PAGE_FIELDS, ...customPageFieldsObj}).map(
       ([key, value]) => `${crossdb.windowFunction({
         func: "first_value",
         value: value,
         ignore_nulls: true,
         partition_fields: "session_id",
         order_fields: 'sessionized_pages.timestamp asc',
       })} as first_${value}`).join(",\n  ")},
-  ${Object.entries({...segmentCommon.PAGE_FIELDS, ...segmentCommon.customPageFieldsObj}).map(
+  ${Object.entries({...segmentCommon.PAGE_FIELDS, ...customPageFieldsObj}).map(
       ([key, value]) => `${crossdb.windowFunction({
         func: "last_value",
         value: value,
@@ -52,13 +57,13 @@ select
 
   -- first values in the session for page fields
   ${ctx.when(global.session.config.warehouse == "bigquery", `struct(\n  `)}
-  ${Object.entries({...segmentCommon.PAGE_FIELDS, ...segmentCommon.customPageFieldsObj}).map(
+  ${Object.entries({...segmentCommon.PAGE_FIELDS, ...customPageFieldsObj}).map(
       ([key, value]) => `first_and_last_page_values.first_${value}`).join(",\n  ")}
   ${ctx.when(global.session.config.warehouse == "bigquery", `) as first_page_values`)},
 
   -- last values in the session for page fields
   ${ctx.when(global.session.config.warehouse == "bigquery", `struct(\n  `)}
-  ${Object.entries({...segmentCommon.PAGE_FIELDS, ...segmentCommon.customPageFieldsObj}).map(
+  ${Object.entries({...segmentCommon.PAGE_FIELDS, ...customPageFieldsObj}).map(
       ([key, value]) => `first_and_last_page_values.last_${value}`).join(",\n  ")}
   ${ctx.when(global.session.config.warehouse == "bigquery", `) as last_page_values`)}
   
@@ -69,13 +74,13 @@ select
       struct(
         segment_sessionized_tracks.timestamp,
         segment_sessionized_tracks.track_id,
-        ${Object.entries({...segmentCommon.TRACK_FIELDS, ...segmentCommon.customTrackFieldsObj}).map(
+        ${Object.entries({...segmentCommon.TRACK_FIELDS, ...customTrackFieldsObj}).map(
       ([key, value]) => `segment_sessionized_tracks.${value}`).join(",\n  ")}
       ) as track,
       struct(
         segment_sessionized_pages.timestamp,
         segment_sessionized_pages.page_id,
-        ${Object.entries({...segmentCommon.PAGE_FIELDS, ...segmentCommon.customPageFieldsObj}).map(
+        ${Object.entries({...segmentCommon.PAGE_FIELDS, ...customPageFieldsObj}).map(
       ([key, value]) => `segment_sessionized_pages.${value}`).join(",\n  ")}
       ) as page
     ) order by segment_sessionized_events.timestamp asc
@@ -90,9 +95,9 @@ from
   left join ${ctx.ref(params.defaultConfig.schema, "segment_sessionized_tracks")} as segment_sessionized_tracks
     using(track_id)`)}
 group by
-  session_id, session_index, user_id ${Object.entries({...segmentCommon.PAGE_FIELDS, ...segmentCommon.customPageFieldsObj}).map(
+  session_id, session_index, user_id ${Object.entries({...segmentCommon.PAGE_FIELDS, ...customPageFieldsObj}).map(
       ([key, value]) => `, first_${value}`).join(" ")}
-  ${Object.entries({...segmentCommon.PAGE_FIELDS, ...segmentCommon.customPageFieldsObj}).map(
+  ${Object.entries({...segmentCommon.PAGE_FIELDS, ...customPageFieldsObj}).map(
       ([key, value]) => `, last_${value}`).join(" ")}
 `)
 }

includes/track_events.js

@@ -5,7 +5,7 @@ module.exports = (params) => {
   const customPageFieldsObj = params.customPageFields.reduce((acc, item) => ({...acc, [item]: item }), {});
 
   const customTrackFieldsObj = params.customTrackFields.reduce((acc, item) => ({...acc, [item]: item }), {});
-  
+    
   return publish("segment_track_events", {
     ...params.defaultConfig
   }).query(ctx => `
@@ -16,7 +16,7 @@ select
   user_id,
   anonymous_id,
   id as track_id,
-  ${Object.entries({...segmentCommon.TRACK_FIELDS, ...segmentCommon.customTrackFieldsObj}).map(
+  ${Object.entries({...segmentCommon.TRACK_FIELDS, ...customTrackFieldsObj}).map(
       ([key, value]) => `${key} as ${value}`).join(",\n    ")}
 from
   ${ctx.ref(params.segmentSchema, "tracks")} as tracks