From 265e9914226297ae644d6ebbf44fc14204040025 Mon Sep 17 00:00:00 2001
From: Clemens Wolff <clewolff@microsoft.com>
Date: Thu, 17 Aug 2017 13:34:34 -0700
Subject: [PATCH 1/2] Fix sentiment dereference for latest model changes

Made necessary by changes in this pull request
https://github.com/CatalystCode/project-fortis-pipeline/pull/118
---
 src/resolvers-cassandra/Tiles/queries.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/resolvers-cassandra/Tiles/queries.js b/src/resolvers-cassandra/Tiles/queries.js
index fc9610c..4286edf 100644
--- a/src/resolvers-cassandra/Tiles/queries.js
+++ b/src/resolvers-cassandra/Tiles/queries.js
@@ -9,12 +9,12 @@ const { trackEvent } = require('../../clients/appinsights/AppInsightsClient');
 const { makeSet } = require('../../utils/collections');
 
 /**
- * @param {{tilex: number, tiley: number, tilez: number, avgsentiment: number, mentioncount: number}} rows
+ * @param {{tilex: number, tiley: number, tilez: number, avgsentimentnumerator: number, mentioncount: number}} rows
  */
 function computedtileToTile(row) {
   const coordinates = [geotile.longitudeFromColumn(row.tiley, row.tilez), geotile.latitudeFromRow(row.tilex, row.tilez)];
   const mentionCount = row.mentioncount;
-  const neg_sentiment = row.avgsentiment;
+  const neg_sentiment = row.avgsentimentnumerator / row.mentioncount;
   const tileId = geotile.tileIdFromRowColumn(row.tilex, row.tiley, row.tilez);
 
   return {
@@ -32,7 +32,7 @@ function queryComputedTiles(tiles, args) {
     const tiley = makeSet(tiles, tile => tile.column);
 
     const query = `
-    SELECT tilex, tiley, tilez, avgsentiment, mentioncount
+    SELECT tilex, tiley, tilez, avgsentimentnumerator, mentioncount
     FROM fortis.computedtiles
     WHERE periodtype = ?
     AND conjunctiontopic1 = ?

From 62c0ee23121d10b96cfba299caf148abb604f141 Mon Sep 17 00:00:00 2001
From: Clemens Wolff <clewolff@microsoft.com>
Date: Thu, 17 Aug 2017 14:09:08 -0700
Subject: [PATCH 2/2] Guard against zero division

---
 src/resolvers-cassandra/Tiles/queries.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resolvers-cassandra/Tiles/queries.js b/src/resolvers-cassandra/Tiles/queries.js
index 4286edf..c707b23 100644
--- a/src/resolvers-cassandra/Tiles/queries.js
+++ b/src/resolvers-cassandra/Tiles/queries.js
@@ -14,7 +14,7 @@ const { makeSet } = require('../../utils/collections');
 function computedtileToTile(row) {
   const coordinates = [geotile.longitudeFromColumn(row.tiley, row.tilez), geotile.latitudeFromRow(row.tilex, row.tilez)];
   const mentionCount = row.mentioncount;
-  const neg_sentiment = row.avgsentimentnumerator / row.mentioncount;
+  const neg_sentiment = row.mentioncount > 0 ? row.avgsentimentnumerator / row.mentioncount : null;
   const tileId = geotile.tileIdFromRowColumn(row.tilex, row.tiley, row.tilez);
 
   return {