From fd0560b8b509a0bcc662339e965fc6b901b91270 Mon Sep 17 00:00:00 2001
From: Daniel Diaz <39510674+IslandRhythms@users.noreply.github.com>
Date: Wed, 9 Mar 2022 18:10:34 -0500
Subject: [PATCH 1/5] comments work

---
 src/actions/handleGithubComment.js | 50 ++++++++++++++++++++++++++++++
 webhookGitHubComment/index.js      | 13 +++++++-
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 src/actions/handleGithubComment.js

diff --git a/src/actions/handleGithubComment.js b/src/actions/handleGithubComment.js
new file mode 100644
index 0000000..15071e0
--- /dev/null
+++ b/src/actions/handleGithubComment.js
@@ -0,0 +1,50 @@
+
+const axios = require('axios');
+const config = require('../../.config')
+module.exports = ({task, conn}) => async function handleGithubComment(params) {
+    const {Subscriber} = conn.models;
+
+    const {comment, issue} = params;
+    const orgs = await axios.get(comment.user['organizations_url']).then(res => res.data);
+    const orgNames = orgs.map(org => org.login);
+    const orgIds = orgs.map(org => org.id);
+    const subscriber = await Subscriber.findOne({
+      $or: [
+        { githubUsername: comment.user.login },
+        { githubUserId: comment.user.id.$numberInt },
+        { githubOrganization: { $in: orgNames } },
+        { githubOrganizationId: { $in: orgIds } },
+        { 'githubOrganizationMembers.login': comment.user.login },
+        { 'githubOrganizationMembers.id': comment.user.id.$numberInt }
+      ]
+    });
+
+    if (subscriber == null) {
+      return { ok: 1 };
+    }
+    await task.log('subscriber commented on issue');
+
+    // Send to Slack
+    const url = 'https://slack.com/api/chat.postMessage';
+    await axios.post(url, {
+      channel: '#pro-notifications',
+      blocks: [
+        {type: 'divider'},
+        {
+          type: 'section',
+          text: {
+            type: 'mrkdwn',
+            text: `*COMMENT CREATED ON ISSUE!* \n\n ${comment.user.login} has posted a comment on issue: *${issue.title}*, ${issue.url}`
+          }
+        },
+        {type: 'divider'},
+        {
+          type: 'section',
+          text: {
+            type: 'mrkdwn',
+            text: `*DESCRIPTION* \n\n ${comment.body}`
+          }
+        }, 
+      ]
+    }, { headers: { authorization: `Bearer ${config.slackToken}` } });
+}
\ No newline at end of file
diff --git a/webhookGitHubComment/index.js b/webhookGitHubComment/index.js
index 64c99d8..f7d8f64 100644
--- a/webhookGitHubComment/index.js
+++ b/webhookGitHubComment/index.js
@@ -6,6 +6,7 @@ const createReleaseFromChangelog = require('../src/actions/createReleaseFromChan
 const { createTokenAuth } = require('@octokit/auth-token');
 const config = require('../.config');
 const connect = require('../src/db');
+const handleGithubComment = require('../src/actions/handleGithubComment');
 
 const ignoreUsers = new Set(config.ignoreUsers);
 
@@ -22,7 +23,7 @@ module.exports = azureWrapper(async function webhookGitHubComment(context, req)
 
   const { token } = await createTokenAuth(config.githubAccessTokenForMongoose)();
 
-  const { action, issue, sender, ref, ref_type } = req.body;
+  const { action, issue, sender, ref, ref_type, comment } = req.body;
 
   await task.log(`Action: ${action}`);
 
@@ -82,6 +83,16 @@ module.exports = azureWrapper(async function webhookGitHubComment(context, req)
         }, 
       ]
     }, { headers: { authorization: `Bearer ${config.slackToken}` } });
+  } else if (action === 'created') {
+
+    if (ignoreUsers.has(comment.user.login)) {
+      return { ok: 1 };
+    }
+
+    await task.log('comment on issue');
+
+    await handleGithubComment({task, conn})(req.body)
+
   } else if (ref != null && ref_type === 'tag') {
     // Assume tag was created, so create a release
     await createReleaseFromChangelog(task)(ref);

From 9eaceb0e41a39c221c7064235272950dc9638e4b Mon Sep 17 00:00:00 2001
From: Daniel Diaz <39510674+IslandRhythms@users.noreply.github.com>
Date: Thu, 10 Mar 2022 13:00:03 -0500
Subject: [PATCH 2/5] changed to correct object key url

---
 src/actions/handleGithubComment.js | 2 +-
 webhookGitHubComment/index.js      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/actions/handleGithubComment.js b/src/actions/handleGithubComment.js
index 15071e0..3b0007d 100644
--- a/src/actions/handleGithubComment.js
+++ b/src/actions/handleGithubComment.js
@@ -34,7 +34,7 @@ module.exports = ({task, conn}) => async function handleGithubComment(params) {
           type: 'section',
           text: {
             type: 'mrkdwn',
-            text: `*COMMENT CREATED ON ISSUE!* \n\n ${comment.user.login} has posted a comment on issue: *${issue.title}*, ${issue.url}`
+            text: `*COMMENT CREATED ON ISSUE!* \n\n ${comment.user.login} has posted a comment on issue: *${issue.title}*, ${issue.html_url}`
           }
         },
         {type: 'divider'},
diff --git a/webhookGitHubComment/index.js b/webhookGitHubComment/index.js
index f7d8f64..aba38bc 100644
--- a/webhookGitHubComment/index.js
+++ b/webhookGitHubComment/index.js
@@ -70,7 +70,7 @@ module.exports = azureWrapper(async function webhookGitHubComment(context, req)
           type: 'section',
           text: {
             type: 'mrkdwn',
-            text: `*NEW ISSUE CREATED!* \n\n ${issue.user.login} has posted an issue titled: ${issue.title}`
+            text: `*NEW ISSUE CREATED!* \n\n ${issue.user.login} has posted an issue titled: *${issue.title}*, Link: ${issue.html_url}`
           }
         },
         {type: 'divider'},

From 1a0c1f7b081edfacd79d1c66cd00e6333d6c5061 Mon Sep 17 00:00:00 2001
From: Daniel Diaz <39510674+IslandRhythms@users.noreply.github.com>
Date: Tue, 15 Mar 2022 18:08:31 -0400
Subject: [PATCH 3/5] progress

---
 src/actions/handleGithubComment.js |  14 +--
 src/integrations/slack.js          |   4 +-
 test/handleGithubComment.test.js   | 183 +++++++++++++++++++++++++++++
 webhookGitHubComment/index.js      |   2 +-
 4 files changed, 191 insertions(+), 12 deletions(-)
 create mode 100644 test/handleGithubComment.test.js

diff --git a/src/actions/handleGithubComment.js b/src/actions/handleGithubComment.js
index 3b0007d..a82b332 100644
--- a/src/actions/handleGithubComment.js
+++ b/src/actions/handleGithubComment.js
@@ -1,19 +1,14 @@
 
-const axios = require('axios');
-const config = require('../../.config')
+
+const {sendMessage} = require('../integrations/slack');
 module.exports = ({task, conn}) => async function handleGithubComment(params) {
     const {Subscriber} = conn.models;
 
     const {comment, issue} = params;
-    const orgs = await axios.get(comment.user['organizations_url']).then(res => res.data);
-    const orgNames = orgs.map(org => org.login);
-    const orgIds = orgs.map(org => org.id);
     const subscriber = await Subscriber.findOne({
       $or: [
         { githubUsername: comment.user.login },
         { githubUserId: comment.user.id.$numberInt },
-        { githubOrganization: { $in: orgNames } },
-        { githubOrganizationId: { $in: orgIds } },
         { 'githubOrganizationMembers.login': comment.user.login },
         { 'githubOrganizationMembers.id': comment.user.id.$numberInt }
       ]
@@ -26,7 +21,7 @@ module.exports = ({task, conn}) => async function handleGithubComment(params) {
 
     // Send to Slack
     const url = 'https://slack.com/api/chat.postMessage';
-    await axios.post(url, {
+    const details = {
       channel: '#pro-notifications',
       blocks: [
         {type: 'divider'},
@@ -46,5 +41,6 @@ module.exports = ({task, conn}) => async function handleGithubComment(params) {
           }
         }, 
       ]
-    }, { headers: { authorization: `Bearer ${config.slackToken}` } });
+    }
+    await sendMessage(details);
 }
\ No newline at end of file
diff --git a/src/integrations/slack.js b/src/integrations/slack.js
index 5080148..e087a16 100644
--- a/src/integrations/slack.js
+++ b/src/integrations/slack.js
@@ -4,9 +4,9 @@ const axios = require('axios');
 const config = require('../../.config');
 
 module.exports = {
-    async sendMessage(jobs) {
+    async sendMessage(payload) {
     const url = 'https://slack.com/api/chat.postMessage';
     // Send to Slack
-    await axios.post(url, jobs, { headers: { authorization: `Bearer ${config.slackToken}` } });
+    return await axios.post(url, payload, { headers: { authorization: `Bearer ${config.slackToken}` } });
     }
 }
\ No newline at end of file
diff --git a/test/handleGithubComment.test.js b/test/handleGithubComment.test.js
new file mode 100644
index 0000000..e597cb3
--- /dev/null
+++ b/test/handleGithubComment.test.js
@@ -0,0 +1,183 @@
+'use strict';
+
+const TaskSchema = require('../src/db/task');
+const assert = require('assert');
+const sinon = require('sinon');
+const slack = require('../src/integrations/slack');
+const handleGithubComment = require('../src/actions/handleGithubComment');
+
+describe('handleGithubComment', function() {
+  let Task;
+  let task;
+  before(() => {
+    Task = conn.model('Task', TaskSchema);
+  });
+
+  beforeEach(async function() {
+    task = await Task.create({});
+  });
+
+  afterEach(() => sinon.restore());
+
+  it('successfully sends a message', async function() {
+
+    const params = {
+        "action": "created",
+        "issue": {
+          "url": "https://api.github.com/repos/Automattic/mongoose/issues/11038",
+          "repository_url": "https://api.github.com/repos/Automattic/mongoose",
+          "labels_url": "https://api.github.com/repos/Automattic/mongoose/issues/11038/labels{/name}",
+          "comments_url": "https://api.github.com/repos/Automattic/mongoose/issues/11038/comments",
+          "events_url": "https://api.github.com/repos/Automattic/mongoose/issues/11038/events",
+          "html_url": "https://github.com/Automattic/mongoose/issues/11038",
+          "id": {
+            "$numberInt": "1069759720"
+          },
+          "node_id": "I_kwDOAAkfd84_wzzo",
+          "number": {
+            "$numberInt": "11038"
+          },
+          "title": "[6.x regression / behavior change?] findOneAndUpdate no longer sets undefined fields as null",
+          "user": {
+            "login": "ronjouch",
+            "id": {
+              "$numberInt": "522085"
+            },
+            "node_id": "MDQ6VXNlcjUyMjA4NQ==",
+            "avatar_url": "https://avatars.githubusercontent.com/u/522085?v=4",
+            "gravatar_id": "",
+            "url": "https://api.github.com/users/ronjouch",
+            "html_url": "https://github.com/ronjouch",
+            "followers_url": "https://api.github.com/users/ronjouch/followers",
+            "following_url": "https://api.github.com/users/ronjouch/following{/other_user}",
+            "gists_url": "https://api.github.com/users/ronjouch/gists{/gist_id}",
+            "starred_url": "https://api.github.com/users/ronjouch/starred{/owner}{/repo}",
+            "subscriptions_url": "https://api.github.com/users/ronjouch/subscriptions",
+            "organizations_url": "https://api.github.com/users/ronjouch/orgs",
+            "repos_url": "https://api.github.com/users/ronjouch/repos",
+            "events_url": "https://api.github.com/users/ronjouch/events{/privacy}",
+            "received_events_url": "https://api.github.com/users/ronjouch/received_events",
+            "type": "User",
+            "site_admin": false
+          },
+          "labels": [
+            {
+              "id": {
+                "$numberInt": "28988582"
+              },
+              "node_id": "MDU6TGFiZWwyODk4ODU4Mg==",
+              "url": "https://api.github.com/repos/Automattic/mongoose/labels/confirmed-bug",
+              "name": "confirmed-bug",
+              "color": "e10c02",
+              "default": false,
+              "description": "We've confirmed this is a bug in Mongoose and will fix it."
+            }
+          ],
+          "state": "closed",
+          "locked": false,
+          "assignee": null,
+          "assignees": [],
+          "milestone": {
+            "url": "https://api.github.com/repos/Automattic/mongoose/milestones/476",
+            "html_url": "https://github.com/Automattic/mongoose/milestone/476",
+            "labels_url": "https://api.github.com/repos/Automattic/mongoose/milestones/476/labels",
+            "id": {
+              "$numberInt": "7282494"
+            },
+            "node_id": "MI_kwDOAAkfd84Abx8-",
+            "number": {
+              "$numberInt": "476"
+            },
+            "title": "6.1.3",
+            "description": "",
+            "creator": {
+              "login": "vkarpov15",
+              "id": {
+                "$numberInt": "1620265"
+              },
+              "node_id": "MDQ6VXNlcjE2MjAyNjU=",
+              "avatar_url": "https://avatars.githubusercontent.com/u/1620265?v=4",
+              "gravatar_id": "",
+              "url": "https://api.github.com/users/vkarpov15",
+              "html_url": "https://github.com/vkarpov15",
+              "followers_url": "https://api.github.com/users/vkarpov15/followers",
+              "following_url": "https://api.github.com/users/vkarpov15/following{/other_user}",
+              "gists_url": "https://api.github.com/users/vkarpov15/gists{/gist_id}",
+              "starred_url": "https://api.github.com/users/vkarpov15/starred{/owner}{/repo}",
+              "subscriptions_url": "https://api.github.com/users/vkarpov15/subscriptions",
+              "organizations_url": "https://api.github.com/users/vkarpov15/orgs",
+              "repos_url": "https://api.github.com/users/vkarpov15/repos",
+              "events_url": "https://api.github.com/users/vkarpov15/events{/privacy}",
+              "received_events_url": "https://api.github.com/users/vkarpov15/received_events",
+              "type": "User",
+              "site_admin": false
+            },
+            "open_issues": {
+              "$numberInt": "12"
+            },
+            "closed_issues": {
+              "$numberInt": "2"
+            },
+            "state": "open",
+            "created_at": "2021-10-23T23:28:00Z",
+            "updated_at": "2021-12-15T15:13:42Z",
+            "due_on": null,
+            "closed_at": null
+          },
+          "comments": {
+            "$numberInt": "1"
+          },
+          "created_at": "2021-12-02T16:40:44Z",
+          "updated_at": "2021-12-15T15:13:42Z",
+          "closed_at": "2021-12-15T15:13:42Z",
+          "author_association": "NONE",
+          "active_lock_reason": null,
+          "body": "I confirm I am using the latest version of mongoose as of today: 6.0.14\r\n\r\n**Do you want to request a *feature* or report a *bug*?**\r\n\r\nUnsure. Maybe this is a 6.x bug/regression, but maybe this is a desired behavior change. Halp, please: is this change desired, and was it documented? I couldn't find a trace of it, neither in the [mongoose / Migrating from 5.x to 6.x](https://mongoosejs.com/docs/migrating_to_6.html) nor in the underlying [node-mongodb-native / Changes in 4.x (and how to migrate!)](https://github.com/mongodb/node-mongodb-native/blob/HEAD/docs/CHANGES_4.0.0.md) docs.\r\n\r\n**Steps to reproduce**\r\n\r\n```js\r\n#!/usr/bin/env node\r\nconst mongoose = require('mongoose');\r\nconst mongooseVersion = require('./node_modules/mongoose/package.json').version;\r\nconst mongooseMajorVersion = parseInt(mongooseVersion.substring(0, 1), 10);\r\nconst mongooseOptions = mongooseMajorVersion === 6 ? {} : { useNewUrlParser: true, useUnifiedTopology: true, useFindAndModify: false };\r\nmongoose.connect('mongodb://localhost:27017/test', mongooseOptions);\r\n\r\nconst Cat = mongoose.model('Cat', { name: String, age: Number });\r\n\r\nasync function testCase() {\r\n  console.log('Using mongoose @', mongooseVersion);\r\n\r\n  // Cleanup for re-runnability\r\n  await Cat.deleteMany({ name: 'Zildjian' });\r\n  const freshZildjian = await Cat.create({ name: 'Zildjian' })\r\n  console.log('Zildjian was born:', JSON.stringify(freshZildjian, null, 2));\r\n\r\n  // What matters\r\n  const updatedZildjian = await Cat.findOneAndUpdate(\r\n    { name: 'Zildjian' }, // Will *NOT* be found, so this findOneAndUpdate will always upsert\r\n    { $set: { age: undefined } }, // What matters: we attempt to set a key with an undefined value\r\n    { new: true },\r\n  )\r\n  console.log('Updated Zildjian:', JSON.stringify(updatedZildjian, null, 2));\r\n  // Difference between Mongoose 5 and 6:\r\n  // - Mongoose 5 used to return a cat with `\"age\": null`\r\n  // - Mongoose 6 returns a cat with no `age`\r\n  // Desired change, or regression?\r\n}\r\n\r\ntestCase().then(() => {\r\n  mongoose.disconnect();\r\n  process.exit(0);\r\n})\r\n```\r\n\r\n**What is the current behavior?**\r\n\r\nMongoose 6 `findOneAndUpdate` does *not* set `undefined` values\r\n\r\n```\r\nUsing mongoose @ 6.0.14\r\nZildjian was born: {\r\n  \"name\": \"Zildjian\",\r\n  \"_id\": \"61a8f24bcdb4dcd14f0ecd03\",\r\n  \"__v\": 0\r\n}\r\nUpdated Zildjian: {\r\n  \"_id\": \"61a8f24bcdb4dcd14f0ecd03\",\r\n  \"name\": \"Zildjian\",\r\n  \"__v\": 0\r\n  // Mongoose 6 does *not* set an `age` key/value (which was passed with value `undefined`)\r\n}\r\n```\r\n\r\n**What is the expected behavior?**\r\n\r\nMongoose 5 `findOneAndUpdate` used to set undefined values as `null`:\r\n\r\n```\r\nUsing mongoose @ 5.13.13\r\nZildjian was born: {\r\n  \"_id\": \"61a8f23dd1891e9f846319d4\",\r\n  \"name\": \"Zildjian\",\r\n  \"__v\": 0\r\n}\r\nUpdated Zildjian: {\r\n  \"_id\": \"61a8f23dd1891e9f846319d4\",\r\n  \"name\": \"Zildjian\",\r\n  \"__v\": 0,\r\n  \"age\": null  // <-- HERE: Mongoose 5 sets the `undefined` age value as `null`\r\n}\r\n```\r\n\r\n→ Is this change desired, and was it documented? I couldn't find a trace of it, neither in the [mongoose / Migrating from 5.x to 6.x](https://mongoosejs.com/docs/migrating_to_6.html) nor in the underlying [node-mongodb-native / Changes in 4.x (and how to migrate!)](https://github.com/mongodb/node-mongodb-native/blob/HEAD/docs/CHANGES_4.0.0.md) docs.\r\n\r\n**What are the versions of Node.js, Mongoose and MongoDB you are using?**\r\n\r\n- Node.js 14.18.2\r\n- Mongoose 5.13.13 / 6.0.14\r\n- MongoDB 5.0.4",
+          "timeline_url": "https://api.github.com/repos/Automattic/mongoose/issues/11038/timeline",
+          "performed_via_github_app": null
+        },
+        "comment": {
+          "url": "https://api.github.com/repos/Automattic/mongoose/issues/comments/994888151",
+          "html_url": "https://github.com/Automattic/mongoose/issues/11038#issuecomment-994888151",
+          "issue_url": "https://api.github.com/repos/Automattic/mongoose/issues/11038",
+          "id": {
+            "$numberInt": "994888151"
+          },
+          "node_id": "IC_kwDOAAkfd847TMnX",
+          "user": {
+            "login": "vkarpov15",
+            "id": {
+              "$numberInt": "1620265"
+            },
+            "node_id": "MDQ6VXNlcjE2MjAyNjU=",
+            "avatar_url": "https://avatars.githubusercontent.com/u/1620265?v=4",
+            "gravatar_id": "",
+            "url": "https://api.github.com/users/vkarpov15",
+            "html_url": "https://github.com/vkarpov15",
+            "followers_url": "https://api.github.com/users/vkarpov15/followers",
+            "following_url": "https://api.github.com/users/vkarpov15/following{/other_user}",
+            "gists_url": "https://api.github.com/users/vkarpov15/gists{/gist_id}",
+            "starred_url": "https://api.github.com/users/vkarpov15/starred{/owner}{/repo}",
+            "subscriptions_url": "https://api.github.com/users/vkarpov15/subscriptions",
+            "organizations_url": "https://api.github.com/users/vkarpov15/orgs",
+            "repos_url": "https://api.github.com/users/vkarpov15/repos",
+            "events_url": "https://api.github.com/users/vkarpov15/events{/privacy}",
+            "received_events_url": "https://api.github.com/users/vkarpov15/received_events",
+            "type": "User",
+            "site_admin": false
+          },
+          "created_at": "2021-12-15T15:13:42Z",
+          "updated_at": "2021-12-15T15:13:42Z",
+          "author_association": "COLLABORATOR",
+          "body": "This is expected behavior in 6.x, we removed the `omitUndefined` option and made it true always. That means Mongoose will always strip undefined keys from updates. There's an entry in the [changelog](https://github.com/Automattic/mongoose/blob/master/CHANGELOG.md#600-rc0--2021-08-03), and we'll add a note to the migration guide with #10672. ",
+        },
+      };
+
+      const stub = sinon.stub(slack, 'sendMessage').callsFake(() => Promise.resolve('Message Sent'));
+      console.log('yo', slack.sendMessage(params))
+
+      const res = await handleGithubComment({task, conn})(params);
+      console.log('the res', res)
+
+  });
+});
\ No newline at end of file
diff --git a/webhookGitHubComment/index.js b/webhookGitHubComment/index.js
index aba38bc..7adc8c3 100644
--- a/webhookGitHubComment/index.js
+++ b/webhookGitHubComment/index.js
@@ -83,7 +83,7 @@ module.exports = azureWrapper(async function webhookGitHubComment(context, req)
         }, 
       ]
     }, { headers: { authorization: `Bearer ${config.slackToken}` } });
-  } else if (action === 'created') {
+  } else if (action === 'created' && comment != null) {
 
     if (ignoreUsers.has(comment.user.login)) {
       return { ok: 1 };

From 92d944b1a92b6312bc626729955025de96dccabe Mon Sep 17 00:00:00 2001
From: Daniel Diaz <39510674+IslandRhythms@users.noreply.github.com>
Date: Wed, 16 Mar 2022 12:19:03 -0400
Subject: [PATCH 4/5] added Test

---
 src/actions/handleGithubComment.js |  8 ++++----
 test/handleGithubComment.test.js   | 24 +++++++++++++++++++-----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/actions/handleGithubComment.js b/src/actions/handleGithubComment.js
index a82b332..fa9d28f 100644
--- a/src/actions/handleGithubComment.js
+++ b/src/actions/handleGithubComment.js
@@ -1,6 +1,7 @@
 
 
-const {sendMessage} = require('../integrations/slack');
+const slack = require('../integrations/slack');
+
 module.exports = ({task, conn}) => async function handleGithubComment(params) {
     const {Subscriber} = conn.models;
 
@@ -13,14 +14,13 @@ module.exports = ({task, conn}) => async function handleGithubComment(params) {
         { 'githubOrganizationMembers.id': comment.user.id.$numberInt }
       ]
     });
-
+    // console.log(params);
     if (subscriber == null) {
       return { ok: 1 };
     }
     await task.log('subscriber commented on issue');
 
     // Send to Slack
-    const url = 'https://slack.com/api/chat.postMessage';
     const details = {
       channel: '#pro-notifications',
       blocks: [
@@ -42,5 +42,5 @@ module.exports = ({task, conn}) => async function handleGithubComment(params) {
         }, 
       ]
     }
-    await sendMessage(details);
+    return await slack.sendMessage(details);
 }
\ No newline at end of file
diff --git a/test/handleGithubComment.test.js b/test/handleGithubComment.test.js
index e597cb3..30aa5a6 100644
--- a/test/handleGithubComment.test.js
+++ b/test/handleGithubComment.test.js
@@ -2,25 +2,39 @@
 
 const TaskSchema = require('../src/db/task');
 const assert = require('assert');
+const connect = require('../src/db');
 const sinon = require('sinon');
 const slack = require('../src/integrations/slack');
 const handleGithubComment = require('../src/actions/handleGithubComment');
 
 describe('handleGithubComment', function() {
+  let conn;
+  let Subscriber;
   let Task;
   let task;
-  before(() => {
+  before(async function() {
+    conn = await connect();
     Task = conn.model('Task', TaskSchema);
+    Subscriber = conn.model('Subscriber');
   });
 
   beforeEach(async function() {
+    await conn.dropDatabase();
     task = await Task.create({});
+
   });
 
   afterEach(() => sinon.restore());
 
   it('successfully sends a message', async function() {
 
+    await Subscriber.create({
+      email: 'val@karpov.io',
+      githubUsername: 'vkarpov15',
+      githubUserId: '1234',
+      githubOrganization: 'mastering-js'
+    });
+
     const params = {
         "action": "created",
         "issue": {
@@ -173,11 +187,11 @@ describe('handleGithubComment', function() {
         },
       };
 
-      const stub = sinon.stub(slack, 'sendMessage').callsFake(() => Promise.resolve('Message Sent'));
-      console.log('yo', slack.sendMessage(params))
+      const stub = sinon.stub(slack, 'sendMessage').callsFake(() => Promise.resolve('Message Sent!'));
 
-      const res = await handleGithubComment({task, conn})(params);
-      console.log('the res', res)
+      await handleGithubComment({task, conn})(params);
+      assert(stub.callCount);
+      assert(stub.returns('Message Sent!'))
 
   });
 });
\ No newline at end of file

From badd444874f36eefe35a6c0d05e3e91b43f3a325 Mon Sep 17 00:00:00 2001
From: Daniel Diaz <39510674+IslandRhythms@users.noreply.github.com>
Date: Mon, 21 Mar 2022 11:24:06 -0400
Subject: [PATCH 5/5] made requested changes

---
 src/actions/handleGithubComment.js |  4 +--
 test/handleGithubComment.test.js   | 54 +++++++++---------------------
 2 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/src/actions/handleGithubComment.js b/src/actions/handleGithubComment.js
index fa9d28f..9de2231 100644
--- a/src/actions/handleGithubComment.js
+++ b/src/actions/handleGithubComment.js
@@ -9,9 +9,9 @@ module.exports = ({task, conn}) => async function handleGithubComment(params) {
     const subscriber = await Subscriber.findOne({
       $or: [
         { githubUsername: comment.user.login },
-        { githubUserId: comment.user.id.$numberInt },
+        { githubUserId: comment.user.id },
         { 'githubOrganizationMembers.login': comment.user.login },
-        { 'githubOrganizationMembers.id': comment.user.id.$numberInt }
+        { 'githubOrganizationMembers.id': comment.user.id }
       ]
     });
     // console.log(params);
diff --git a/test/handleGithubComment.test.js b/test/handleGithubComment.test.js
index 30aa5a6..c8365e5 100644
--- a/test/handleGithubComment.test.js
+++ b/test/handleGithubComment.test.js
@@ -44,19 +44,13 @@ describe('handleGithubComment', function() {
           "comments_url": "https://api.github.com/repos/Automattic/mongoose/issues/11038/comments",
           "events_url": "https://api.github.com/repos/Automattic/mongoose/issues/11038/events",
           "html_url": "https://github.com/Automattic/mongoose/issues/11038",
-          "id": {
-            "$numberInt": "1069759720"
-          },
+          "id": "1069759720",
           "node_id": "I_kwDOAAkfd84_wzzo",
-          "number": {
-            "$numberInt": "11038"
-          },
+          "number": "11038",
           "title": "[6.x regression / behavior change?] findOneAndUpdate no longer sets undefined fields as null",
           "user": {
             "login": "ronjouch",
-            "id": {
-              "$numberInt": "522085"
-            },
+            "id": "522085",
             "node_id": "MDQ6VXNlcjUyMjA4NQ==",
             "avatar_url": "https://avatars.githubusercontent.com/u/522085?v=4",
             "gravatar_id": "",
@@ -76,9 +70,7 @@ describe('handleGithubComment', function() {
           },
           "labels": [
             {
-              "id": {
-                "$numberInt": "28988582"
-              },
+              "id": "28988582",
               "node_id": "MDU6TGFiZWwyODk4ODU4Mg==",
               "url": "https://api.github.com/repos/Automattic/mongoose/labels/confirmed-bug",
               "name": "confirmed-bug",
@@ -95,20 +87,14 @@ describe('handleGithubComment', function() {
             "url": "https://api.github.com/repos/Automattic/mongoose/milestones/476",
             "html_url": "https://github.com/Automattic/mongoose/milestone/476",
             "labels_url": "https://api.github.com/repos/Automattic/mongoose/milestones/476/labels",
-            "id": {
-              "$numberInt": "7282494"
-            },
+            "id": "7282494",
             "node_id": "MI_kwDOAAkfd84Abx8-",
-            "number": {
-              "$numberInt": "476"
-            },
+            "number": "476",
             "title": "6.1.3",
             "description": "",
             "creator": {
               "login": "vkarpov15",
-              "id": {
-                "$numberInt": "1620265"
-              },
+              "id": "1620265",
               "node_id": "MDQ6VXNlcjE2MjAyNjU=",
               "avatar_url": "https://avatars.githubusercontent.com/u/1620265?v=4",
               "gravatar_id": "",
@@ -126,21 +112,15 @@ describe('handleGithubComment', function() {
               "type": "User",
               "site_admin": false
             },
-            "open_issues": {
-              "$numberInt": "12"
-            },
-            "closed_issues": {
-              "$numberInt": "2"
-            },
+            "open_issues": "12",
+            "closed_issues": "2",
             "state": "open",
             "created_at": "2021-10-23T23:28:00Z",
             "updated_at": "2021-12-15T15:13:42Z",
             "due_on": null,
             "closed_at": null
           },
-          "comments": {
-            "$numberInt": "1"
-          },
+          "comments": "1",
           "created_at": "2021-12-02T16:40:44Z",
           "updated_at": "2021-12-15T15:13:42Z",
           "closed_at": "2021-12-15T15:13:42Z",
@@ -154,15 +134,11 @@ describe('handleGithubComment', function() {
           "url": "https://api.github.com/repos/Automattic/mongoose/issues/comments/994888151",
           "html_url": "https://github.com/Automattic/mongoose/issues/11038#issuecomment-994888151",
           "issue_url": "https://api.github.com/repos/Automattic/mongoose/issues/11038",
-          "id": {
-            "$numberInt": "994888151"
-          },
+          "id": "994888151",
           "node_id": "IC_kwDOAAkfd847TMnX",
           "user": {
             "login": "vkarpov15",
-            "id": {
-              "$numberInt": "1620265"
-            },
+            "id": "1620265",
             "node_id": "MDQ6VXNlcjE2MjAyNjU=",
             "avatar_url": "https://avatars.githubusercontent.com/u/1620265?v=4",
             "gravatar_id": "",
@@ -190,8 +166,8 @@ describe('handleGithubComment', function() {
       const stub = sinon.stub(slack, 'sendMessage').callsFake(() => Promise.resolve('Message Sent!'));
 
       await handleGithubComment({task, conn})(params);
-      assert(stub.callCount);
-      assert(stub.returns('Message Sent!'))
-
+      assert.equal(stub.callCount, 1);
+      assert.equal(stub.getCall(0).args[0].channel, '#pro-notifications')
+      assert(stub.getCall(0).args[0].blocks[1].text.text.includes('vkarpov15'))
   });
 });
\ No newline at end of file