merge addTop branch

O-Mutt · Oct 1, 2021 · 0adbf1e · 0adbf1e
2 parents d949679 + 198f7ac
commit 0adbf1e
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hubot-plusplus-expanded",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "A hubot script for micro praise",
   "main": "index.js",
   "engines": {

diff --git a/src/lib/services/database.js b/src/lib/services/database.js
@@ -97,18 +97,19 @@ class DatabaseService {
   }
 
   async savePlusPlusLog(to, from, room, reason, incrementValue) {
+    const pointsAmount = parseInt(incrementValue, 10);
     const fromId = from.slackId || from.name;
     const scoreSearch = from.slackId ? { slackId: from.slackId } : { name: from.name };
     const toId = to.slackId || to.name;
     const db = await this.getDb();
-    await db.collection(scoresDocumentName).updateOne(scoreSearch, { $inc: { totalPointsGiven: incrementValue } });
+    await db.collection(scoresDocumentName).updateOne(scoreSearch, { $inc: { totalPointsGiven: pointsAmount } });
     await db.collection(logDocumentName).insertOne({
       from: fromId,
       to: toId,
       date: moment().toISOString(),
       room,
       reason,
-      scoreChange: incrementValue,
+      scoreChange: pointsAmount,
     });
   }
 

diff --git a/test/mockData/mockFullUser.json b/test/mockData/mockFullUser.json
@@ -84,5 +84,6 @@
 	},
 	"hubotDay" : "2020-07-09T16:55:04.374Z",
 	"accountLevel": 1,
-  "slackId": "matt.erickson"
+  "slackId": "matt.erickson",
+	"totalPointsGiven": 13
 }
diff --git a/test/mockData/mockFullUserLevel2.json b/test/mockData/mockFullUserLevel2.json
@@ -85,5 +85,6 @@
   "hubotDay" : "2020-07-09T16:55:04.374Z",
   "accountLevel": 2,
   "token": 200,
-  "slackId": "peter.parker"
+  "slackId": "peter.parker",
+  "totalPointsGiven": 13
 }
diff --git a/test/mockData/mockMinimalUser.json b/test/mockData/mockMinimalUser.json
@@ -14,5 +14,6 @@
 	},
 	"hubotDay" : "2020-07-09T16:55:04.374Z",
 	"accountLevel": 1,
-  "slackId": "matt.erickson.min"
+  "slackId": "matt.erickson.min",
+	"totalPointsGiven": -2
 }
diff --git a/test/mockData/mockMinimalUserLevel2.json b/test/mockData/mockMinimalUserLevel2.json
@@ -15,5 +15,6 @@
   "hubotDay" : "2020-07-09T16:55:04.374Z",
   "accountLevel": 2,
   "token": 8,
-  "slackId": "peter.parker.min"
+  "slackId": "peter.parker.min",
+  "totalPointsGiven": -2
 }
diff --git a/test/plusplus.test.js b/test/plusplus.test.js
@@ -270,6 +270,13 @@ describe('PlusPlus', function () {
       expect(from.token).to.equal(198);
       room.user.say('peter.parker', '@hubot @peter.parker.min + 2');
       await new Promise((resolve) => setTimeout(resolve, 50));
+      const spamCheck = await db.collection('scoreLog').findOne({ from: 'peter.parker' });
+      expect(Object.keys(spamCheck)).to.eql(['_id', 'from', 'to', 'date', 'room', 'reason', 'scoreChange']);
+      spamCheck.date = '123'; // hack to handle date;
+      spamCheck._id = '1';
+      expect(spamCheck).to.deep.include({
+        from: 'peter.parker', to: 'peter.parker.min', reason: null, room: room.name, scoreChange: 2, _id: '1', date: '123',
+      });
       expect(room.messages[3][1]).to.equal("I'm sorry <@peter.parker>, I'm afraid I can't do that.");
     });
   });

diff --git a/test/scoreboard.test.js b/test/scoreboard.test.js
@@ -36,7 +36,7 @@ describe('Scoreboard', function () {
       room.user.say('matt.erickson', '@hubot score for @matt.erickson');
       await new Promise((resolve) => setTimeout(resolve, 45));
       expect(room.messages[1][1]).to.match(
-        /<@matt\.erickson> has 227 points\.\nAccount Level: 1\nTotal Points Given: 14\n:birthday: Hubotday is 07-09-2020\n\n:star: Here are some reasons :star:(\n.*:.*){5}/,
+        /<@matt\.erickson> has 227 points\.\nAccount Level: 1\nTotal Points Given: 13\n:birthday: Hubotday is 07-09-2020\n\n:star: Here are some reasons :star:(\n.*:.*){5}/,
       );
     });