Gitlab support

Author: jmgasper

README.md

@@ -75,7 +75,7 @@ set GITLAB_SECRET_TOKEN=...
 - go to the repository you want to watch
 - click: Settings -> Options(in the left panel) -> Webhooks
 - click: 'Add Webhook' button
-- fill the form: 
+- fill the form:
     - Payload URL: `https://<YOUR_HOST>/webhooks/github`,
     for example: `https://4bb6c860.ngrok.io/webhooks/github`
     - Content Type: application/json
@@ -111,7 +111,6 @@ use `ngrok` to make your local deploy accessible by internet:
 ngrok http 3000
 ```
 
-
 ## GitHub Verification
 
 - properly config and run the `receiver` app.
@@ -121,16 +120,22 @@ ngrok http 3000
 - create a comment on an issue, you can see the logs in `receiver` and `processor`, the `comment.created` event is generated.
 - update a comment on an issue, you can see the logs in `receiver` and `processor`, the `comment.updated` event is generated.
 - assigned a user to an issue, you can see the logs in `receiver` and `processor`, the `issue.assigned` event is generated.
-- assigned a user to an issue, you can see the logs in `receiver` and `processor`, the `issue.unassigned` event is generated.
-- add a label to an issue, you can see the logs in `receiver` and `processor`, the `issue.labeled` event is generated.
-- remove a label to an issue, you can see the logs in `receiver` and `processor`, the `issue.unlabeled` event is generated.
+- un-assigned a user to an issue, you can see the logs in `receiver` and `processor`, the `issue.unassigned` event is generated.
+- add/remove a label to an issue, you can see the logs in `receiver` and `processor`, the `issue.labelUpdated` event is generated.
 - create a pull request, you can see the logs in `receiver` and `processor`, the `pull_request.created` event is generated.
 - close a pull request without merge, you can see the logs in `receiver` and `processor`, the `pull_request.closed` event is generated and the `merged` property is `false`.
 - merge a pull request, you can see the logs in `receiver` and `processor`, the `pull_request.closed` event is generated and the `merged` property is `true`.
 
 ## Gitlab Verification
+
 - properly config and run the `receiver` app.
 - properly config and run the `processor` app.
 - create an issue in the repo, you can see the logs in `receiver` and `processor`, the `issue.created` event is generated.
-
-
+- update an issue in the repo, you can see the logs in `receiver` and `processor`, the `issue.updated` event is generated.
+- create a comment on an issue, you can see the logs in `receiver` and `processor`, the `comment.created` event is generated.
+- assigned a user to an issue, you can see the logs in `receiver` and `processor`, the `issue.assigned` event is generated.
+- un-assigned a user to an issue, you can see the logs in `receiver` and `processor`, the `issue.unassigned` event is generated.
+- add/remove a label to an issue, you can see the logs in `receiver` and `processor`, the `issue.labelUpdated` event is generated.
+- create a pull request, you can see the logs in `receiver` and `processor`, the `pull_request.created` event is generated.
+- close a pull request without merge, you can see the logs in `receiver` and `processor`, the `pull_request.closed` event is generated and the `merged` property is `false`.
+- merge a pull request, you can see the logs in `receiver` and `processor`, the `pull_request.closed` event is generated and the `merged` property is `true`.

models/CommentCreatedEvent.js

@@ -21,8 +21,7 @@ CommentCreatedEvent.schema = Joi.object().keys({
     id: Joi.number().required(),
     body: Joi.string().allow(''),
     user: Joi.object().keys({
-      id: Joi.number().required(),
-      name: Joi.string().required()
+      id: Joi.number().required()
     }).required()
   }),
   repository: repositorySchema.required()

models/CommentUpdatedEvent.js

@@ -21,8 +21,7 @@ CommentUpdatedEvent.schema = Joi.object().keys({
     id: Joi.number().required(),
     body: Joi.string().allow(''),
     user: Joi.object().keys({
-      id: Joi.number().required(),
-      name: Joi.string().required()
+      id: Joi.number().required()
     }).required()
   }),
   repository: repositorySchema.required()

models/LabelUpdatedEvent.js

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2018 TopCoder, Inc. All rights reserved.
+ */
+/**
+ * This module contains the schema of the LabelUpdatedEvent.
+ *
+ * @author TCSCODER
+ * @version 1.0
+ */
+'use strict';
+const Joi = require('joi');
+const {issueSchema, repositorySchema} = require('./common');
+
+const LabelUpdatedEvent = {
+  name: 'issue.labelUpdated'
+};
+
+LabelUpdatedEvent.schema = Joi.object().keys({
+  issue: issueSchema.required(),
+  repository: repositorySchema.required(),
+  labels: Joi.array().items(Joi.string()).required()
+});
+
+module.exports = LabelUpdatedEvent;

models/UserAssignedEvent.js

@@ -19,8 +19,7 @@ UserAssignedEvent.schema = Joi.object().keys({
   issue: issueSchema.required(),
   repository: repositorySchema.required(),
   assignee: Joi.object().keys({
-    id: Joi.number().required(),
-    name: Joi.string().required()
+    id: Joi.number().required()
   }).required()
 });
 

models/UserUnassignedEvent.js

@@ -17,11 +17,7 @@ const UserUnassignedEvent = {
 
 UserUnassignedEvent.schema = Joi.object().keys({
   issue: issueSchema.required(),
-  repository: repositorySchema.required(),
-  assignee: Joi.object().keys({
-    id: Joi.number().required(),
-    name: Joi.string().required()
-  }).required()
+  repository: repositorySchema.required()
 });
 
 module.exports = UserUnassignedEvent;

models/common.js

@@ -28,12 +28,10 @@ const issueSchema = Joi.object().keys({
   body: Joi.string().allow(''),
   labels: Joi.array().items(Joi.string()),
   assignees: Joi.array().items(Joi.object().keys({
-    id: Joi.number().required(),
-    name: Joi.string().required()
+    id: Joi.number().required()
   })),
   owner: Joi.object().keys({
-    id: Joi.number().required(),
-    name: Joi.string().required()
+    id: Joi.number().required()
   }).required()
 });
 
@@ -45,12 +43,10 @@ const pullRequestSchema = Joi.object().keys({
   body: Joi.string().allow(''),
   title: Joi.string().required(),
   user: Joi.object().keys({
-    id: Joi.number().required(),
-    name: Joi.string().required()
+    id: Joi.number().required()
   }),
   assignees: Joi.array().items({
-    id: Joi.number().required(),
-    name: Joi.string().required()
+    id: Joi.number().required()
   })
 });
 

models/index.js

@@ -16,10 +16,9 @@ const CommentCreatedEvent = require('./CommentCreatedEvent');
 const CommentUpdatedEvent = require('./CommentUpdatedEvent');
 const UserAssignedEvent = require('./UserAssignedEvent');
 const UserUnassignedEvent = require('./UserUnassignedEvent');
-const LabelAssignedEvent = require('./LabelAssignedEvent');
-const LabelUnassignedEvent = require('./LabelUnassignedEvent');
 const PullRequestCreatedEvent = require('./PullRequestCreatedEvent');
 const PullRequestClosedEvent = require('./PullRequestClosedEvent');
+const LabelUpdatedEvent = require('./LabelUpdatedEvent');
 
 module.exports = {
   IssueCreatedEvent,
@@ -28,8 +27,7 @@ module.exports = {
   CommentUpdatedEvent,
   UserAssignedEvent,
   UserUnassignedEvent,
-  LabelAssignedEvent,
-  LabelUnassignedEvent,
   PullRequestCreatedEvent,
-  PullRequestClosedEvent
+  PullRequestClosedEvent,
+  LabelUpdatedEvent
 };

utils/GithubEventDetector.js

@@ -23,12 +23,10 @@ const parseIssue = (issue) => ({
   title: issue.title,
   labels: _.map(issue.labels, 'name'),
   assignees: _.map(issue.assignees, (assignee) => ({
-    id: assignee.id,
-    name: assignee.login
+    id: assignee.id
   })),
   owner: {
-    id: issue.user.id,
-    name: issue.user.login
+    id: issue.user.id
   }
 });
 
@@ -45,12 +43,10 @@ const parsePullRequest = (data) => ({
   body: data.pull_request.body,
   title: data.pull_request.title,
   user: {
-    id: data.pull_request.user.id,
-    name: data.pull_request.user.login
+    id: data.pull_request.user.id
   },
   assignees: _.map(data.pull_request.assignees, (a) => ({
-    id: a.id,
-    name: a.login
+    id: a.id
   }))
 });
 
@@ -97,8 +93,7 @@ const parseComment = (data) => ({
     id: data.comment.id,
     body: data.comment.body,
     user: {
-      id: data.comment.user.id,
-      name: data.comment.user.login
+      id: data.comment.user.id
     }
   }
 });
@@ -149,8 +144,7 @@ UserAssignedEvent.parse = (data) => ({
   issue: parseIssue(data.issue),
   repository: parseRepository(data.repository),
   assignee: {
-    id: data.assignee.id,
-    name: data.assignee.login
+    id: data.assignee.id
   }
 });
 
@@ -170,52 +164,27 @@ UserUnassignedEvent.schema = Joi.object().keys({
 
 UserUnassignedEvent.parse = (data) => ({
   issue: parseIssue(data.issue),
-  repository: parseRepository(data.repository),
-  assignee: {
-    id: data.assignee.id,
-    name: data.assignee.login
-  }
+  repository: parseRepository(data.repository)
 });
 
 // end the UserUnassignedEvent
 
-// begin the LabelAssignedEvent
-const LabelAssignedEvent = {
-  event: models.LabelAssignedEvent
-};
-
-LabelAssignedEvent.schema = Joi.object().keys({
-  action: Joi.string().valid('labeled').required(),
-  issue: Joi.object().required(),
-  label: Joi.object().required(),
-  repository: Joi.object().required()
-});
-
-LabelAssignedEvent.parse = (data) => ({
-  issue: parseIssue(data.issue),
-  repository: parseRepository(data.repository),
-  label: data.label.name
-});
-// end the LabelAssignedEvent
-
-// begin the LabelUnassignedEvent
-const LabelUnassignedEvent = {
-  event: models.LabelUnassignedEvent
+// start of LabelUpdatedEvent
+const LabelUpdatedEvent = {
+  event: models.LabelUpdatedEvent,
+  schema: Joi.object().keys({
+    action: Joi.string().valid('unlabeled', 'labeled').required(),
+    issue: Joi.object().required(),
+    label: Joi.object().required(),
+    repository: Joi.object().required()
+  }),
+  parse: (data) => ({
+    issue: parseIssue(data.issue),
+    repository: parseRepository(data.repository),
+    labels: _.map(data.issue.labels, 'name')
+  })
 };
 
-LabelUnassignedEvent.schema = Joi.object().keys({
-  action: Joi.string().valid('unlabeled').required(),
-  issue: Joi.object().required(),
-  label: Joi.object().required(),
-  repository: Joi.object().required()
-});
-
-LabelUnassignedEvent.parse = (data) => ({
-  issue: parseIssue(data.issue),
-  repository: parseRepository(data.repository),
-  label: data.label.name
-});
-
 // end the LabelUnassignedEvent
 
 // begin the PullRequestCreatedEvent
@@ -259,8 +228,7 @@ module.exports = new EventDetector('github', [
   CommentUpdatedEvent,
   UserAssignedEvent,
   UserUnassignedEvent,
-  LabelAssignedEvent,
-  LabelUnassignedEvent,
+  LabelUpdatedEvent,
   PullRequestCreatedEvent,
   PullRequestClosedEvent
 ]);