session_id into properties

Author: cstryker

api_server/modules/analytics/analytics_client.js

@@ -39,8 +39,9 @@ class AnalyticsClient {
 			timestamp: new Date(),
 			type: "track",
 			anonymousId: UUID(),
-			session_id: UUID()
 		};
+		data.session_id = data.session_id || UUID();
+
 		const nrUserId = options.user ? options.user.get('nrUserId') : options.nrUserId;
 		if (nrUserId) {
 			trackData.userId = nrUserId; //userId;

api_server/modules/code_errors/test/unfollow_link/tracking_test.js

@@ -74,13 +74,13 @@ class TrackingTest extends Aggregation(CodeStreamMessageTest, CommonInit) {
 			messageId: data.messageId || '<missing messageId>',
 			timestamp: data.timestamp || '<missing timestamp>',
 			anonymousId: data.anonymousId || '<missing anonymousId>',
-			session_id: data.session_id || '<missing session_id>',
 			type: 'track',
 			properties: {
 				//user_id: this.currentUser.user.nrUserId,
 				platform: 'codestream',
 				path: 'N/A (codestream)',
 				section: 'N/A (codestream)',
+				session_id: data.session_id || '<missing session_id>',
 				meta_data_15: JSON.stringify(expectedMetaData),
 				meta_data_14: 'change: code_error_unfollowed',
 				meta_data_13: 'source_of_change: email_link'

api_server/modules/codemarks/test/unfollow_link/tracking_test.js

@@ -74,13 +74,13 @@ class TrackingTest extends Aggregation(CodeStreamMessageTest, CommonInit) {
 			messageId: data.messageId || '<missing messageId>',
 			timestamp: data.timestamp || '<missing timestamp>',
 			anonymousId: data.anonymousId || '<missing anonymousId>',
-			session_id: data.session_id || '<missing session_id>',
 			type: 'track',
 			properties: {
 				//user_id: this.currentUser.user.nrUserId,
 				platform: 'codestream',
 				path: 'N/A (codestream)',
 				section: 'N/A (codestream)',
+				session_id: data.session_id || '<missing session_id>',
 				meta_data_15: JSON.stringify(expectedMetaData),
 				meta_data_14: 'change: codemark_unfollowed',
 				meta_data_13: 'source_of_change: email_link'

api_server/modules/inbound_emails/test/tracking_test.js

@@ -107,13 +107,13 @@ class TrackingTest extends InboundEmailMessageTest {
 			messageId: data.messageId || '<missing messageId>',
 			timestamp: data.timestamp || '<missing timestamp>',
 			anonymousId: data.anonymousId || '<missing anonymousId>',
-			session_id: data.session_id || '<missing session_id>',
 			type: 'track',
 			properties: {
 				//user_id: this.currentUser.user.nrUserId,
 				platform: 'codestream',
 				path: 'N/A (codestream)',
 				section: 'N/A (codestream)',
+				session_id: data.session_id || '<missing session_id>',
 				meta_data_15: JSON.stringify(expectedMetaData),
 				'Parent ID': parentId,
 				'Parent Type': parentType,

api_server/modules/reviews/test/unfollow_link/tracking_test.js

@@ -74,13 +74,13 @@ class TrackingTest extends Aggregation(CodeStreamMessageTest, CommonInit) {
 			messageId: data.messageId || '<missing messageId>',
 			timestamp: data.timestamp || '<missing timestamp>',
 			anonymousId: data.anonymousId || '<missing anonymousId>',
-			session_id: data.session_id || '<missing session_id>',
 			type: 'track',
 			properties: {
 				//user_id: this.currentUser.user.nrUserId,
 				platform: 'codestream',
 				path: 'N/A (codestream)',
 				section: 'N/A (codestream)',
+				session_id: data.session_id || '<missing session_id>',
 				meta_data_15: JSON.stringify(expectedMetaData),
 				meta_data_14: 'change: review_unfollowed',
 				meta_data_13: 'source_of_change: email_link'

api_server/modules/users/test/unsubscribe_notification/tracking_test.js

@@ -65,13 +65,13 @@ class TrackingTest extends Aggregation(CodeStreamMessageTest, CommonInit) {
 			messageId: data.messageId || '<missing messageId>',
 			timestamp: data.timestamp || '<missing timestamp>',
 			anonymousId: data.anonymousId || '<missing anonymousId>',
-			session_id: data.session_id || '<missing session_id>',
 			type: 'track',
 			properties: {
 				//user_id: this.currentUser.user.nrUserId,
 				platform: 'codestream',
 				path: 'N/A (codestream)',
 				section: 'N/A (codestream)',
+				session_id: data.session_id || '<missing session_id>',
 				meta_data_15: JSON.stringify(expectedMetaData),
 				'meta_data': 'email_type: discussion',
 				'event_type': 'response'

api_server/modules/users/test/unsubscribe_reminder/tracking_test.js

@@ -65,13 +65,13 @@ class TrackingTest extends Aggregation(CodeStreamMessageTest, CommonInit) {
 			messageId: data.messageId || '<missing messageId>',
 			timestamp: data.timestamp || '<missing timestamp>',
 			anonymousId: data.anonymousId || '<missing anonymousId>',
-			session_id: data.session_id || '<missing session_id>',
 			type: 'track',
 			properties: {
 				//user_id: this.currentUser.user.nrUserId,
 				platform: 'codestream',
 				path: 'N/A (codestream)',
 				section: 'N/A (codestream)',
+				session_id: data.session_id || '<missing session_id>',
 				meta_data_15: JSON.stringify(expectedMetaData),
 				'meta_data': 'email_type: reminder',
 				'event_type': 'response'

api_server/modules/users/test/unsubscribe_weekly/tracking_test.js

@@ -69,13 +69,13 @@ class TrackingTest extends Aggregation(CodeStreamMessageTest, CommonInit) {
 			messageId: data.messageId || '<missing messageId>',
 			timestamp: data.timestamp || '<missing timestamp>',
 			anonymousId: data.anonymousId || '<missing anonymousId>',
-			session_id: data.session_id || '<missing session_id>',
 			type: 'track',
 			properties: {
 				//user_id: this.currentUser.user.nrUserId,
 				platform: 'codestream',
 				path: 'N/A (codestream)',
 				section: 'N/A (codestream)',
+				session_id: data.session_id || '<missing session_id>',
 				meta_data_15: JSON.stringify(expectedMetaData),
 				'meta_data': 'email_type: weekly_activity',
 				'event_type': 'response'