Production deploy updates

Author: jmgasper

constants.js

@@ -26,7 +26,7 @@ const USER_ROLES = {
 const CHALLENGE_STATUS = {
   ACTIVE: 'Active',
   COMPLETED: 'Completed',
-  CANCELED: 'Canceled'
+  CANCELED: 'Cancelled'
 };
 
 const SERVICE_ERROR_STATUS = 500;

models/Project.js

@@ -42,7 +42,8 @@ const schema = new Schema({
     type: Date,
     default: Date.now
   },
-  createCopilotPayments: {type: String, required: false}
+  createCopilotPayments: {type: String, required: false},
+  isConnect: {type: Boolean, required: false, default: true}
 });
 
 module.exports = schema;

package.json

@@ -9,7 +9,8 @@
     "test": "mocha",
     "test:github": "mocha test/github.test.js",
     "test:gitlab": "mocha test/gitlab.test.js",
-    "create-tables": "CREATE_DB=true node scripts/create-update-tables.js"
+    "create-tables": "CREATE_DB=true node scripts/create-update-tables.js",
+    "direct-connect-migration": "node scripts/direct-connect-migration.js"
   },
   "engines": {
     "node": "~8.6.0"

scripts/direct-connect-migration.js

@@ -0,0 +1,57 @@
+'use strict';
+
+const _ = require('lodash');
+const models = require('../models');
+const dbHelper = require('../utils/db-helper');
+const logger = require('../utils/logger');
+const topcoderApiHelper = require('../utils/topcoder-api-helper');
+
+/**
+ * Migrate direct ids to connect ids
+ */
+async function migrate() {
+    // How many projects per scan
+  const batchSize = process.env.BATCH_SIZE || 15; // eslint-disable-line no-magic-numbers
+  let batch = 1;
+    // How many projects have been returned in previous scan
+  let previousSize = batchSize;
+    // Key of a last project
+  let previousKey = null;
+  while (previousSize === batchSize) { // eslint-disable-line no-restricted-syntax
+    logger.info(`Starting batch ${batch}`);
+    // Scan for projects with field isConnect null and return its id and tcDirectId
+    const projects = await models.Project.scan('isConnect')
+            .null()
+            .attributes(['id', 'tcDirectId'])
+            .limit(batchSize)
+            .startAt(previousKey)
+            .consistent()
+            .exec();
+    previousSize = projects.count;
+    previousKey = projects.lastKey;
+    const promises = _.map(projects, (project) => topcoderApiHelper.getProjectByDirectId(project.id, project.tcDirectId));
+        // Execute all promises and process data
+    await Promise.all(promises).then(async (resArray) => {
+            // Filter out empty arrays
+      const directProjects = _.filter(resArray, (res) => res.data.length > 0);
+      await Promise.all(_.map(directProjects, (directProject) =>
+                // Promise to update tcDirectId and set isConnect field to true for project with its id
+                 dbHelper.update(models.Project,
+                   directProject.dbId,
+                   {
+                     tcDirectId: directProject.data[0].id,
+                     isConnect: true
+                   }).then(() => {
+                     // eslint-disable-next-line max-len
+                     logger.debug(`Migrated direct project: ${directProject.data[0].directProjectId} to connect: ${directProject.data[0].id}, database id: ${directProject.dbId}`);
+                   })));
+    });
+    batch += 1;
+  }
+}
+
+migrate().then(() => {
+  logger.info('Migration completed');
+}).catch((err) => {
+  logger.logFullError(err, 'migration');
+});

services/IssueService.js

@@ -13,7 +13,6 @@
 const config = require('config');
 const _ = require('lodash');
 const Joi = require('joi');
-const MarkdownIt = require('markdown-it');
 const logger = require('../utils/logger');
 const errors = require('../utils/errors');
 const topcoderApiHelper = require('../utils/topcoder-api-helper');
@@ -25,7 +24,6 @@ const userService = require('./UserService');
 const eventService = require('./EventService');
 const constants = require('../constants');
 
-const md = new MarkdownIt();
 
 // A variable to store issue creation lock to prevent duplicate creation process.
 // The key is `${provider}-${repositoryId}-${number}`. The value is True.
@@ -216,13 +214,18 @@ async function handleIssueAssignment(event, issue, force = false) {
         logger.debugWithContext(`${userMapping.topcoderUsername} Already registered as assignee`, event, issue);
         return;
       }
-
-      // The issue has registered assignee. Ignore it.
+      const hasAssignedLabel = _.includes(issue.labels, config.ASSIGNED_ISSUE_LABEL);
+      // Gitlab doesn't send separate unassignment hook if we unassigne and assigne users in the same step
+      // in result new assignee was not handled previously
+      if (dbIssue.assignee && event.provider === 'gitlab' && dbIssue.assignee !== assigneeUserId && hasAssignedLabel) {
+        await handleIssueUnAssignment(event, issue);
+        return;
+      }
+      // The github issue has registered assignee. Ignore it.
       // If there is assignee changes, it will be handled at handleIssueUnassignment and this func will be called again.
       if (dbIssue.assignee) {
         return;
       }
-
       // ensure issue has open for pickup label
       const hasOpenForPickupLabel = _(issue.labels).includes(config.OPEN_FOR_PICKUP_ISSUE_LABEL); // eslint-disable-line lodash/chaining
       const hasNotReadyLabel = _(issue.labels).includes(config.NOT_READY_ISSUE_LABEL); // eslint-disable-line lodash/chaining
@@ -693,7 +696,6 @@ async function handleIssueUnAssignment(event, issue) {
       // Ignore it.
       return;
     }
-
     if (dbIssue.assignee) {
       const assigneeUserId = await gitHelper.getUserIdByLogin(event, dbIssue.assignee);
       if (!assigneeUserId) {
@@ -865,8 +867,7 @@ async function process(event) {
     issue.repositoryId = helper.hashCode(issue.repositoryId);
   }
 
-  // Markdown the body
-  issue.body = md.render(_.get(issue, 'body', ''));
+  issue.body = _.get(issue, 'body', '');
   if (event.data.issue.assignees && event.data.issue.assignees.length > 0 && event.data.issue.assignees[0].id) {
     issue.assignee = await gitHelper.getUsernameById(event, event.data.issue.assignees[0].id);
   }

utils/topcoder-api-helper.js

@@ -431,6 +431,34 @@ async function removeResourceToChallenge(id, handle, roleId) {
     throw errors.convertTopcoderApiError(err, 'Failed to remove resource from the challenge.');
   }
 }
+/**
+ * Finds project by given direct id and returns it
+ * @param {id} id in the database
+ * @param {Number} directId
+ * @returns {Promise}
+ */
+async function getProjectByDirectId(id, directId) {
+  const apiKey = await getM2Mtoken();
+  return axios.get(`${config.TC_API_URL}/projects`, {
+    params: {
+      directProjectId: directId
+    },
+    headers: {
+      authorization: `Bearer ${apiKey}`
+    }
+  }).then((data) => {
+    // Append database project id to response
+    data.dbId = id;
+    // Log to debug if project is empty
+    if (data.data.length === 0) {
+      logger.debug(`Project with direct id ${directId} (database: ${id}) was not found in connect`);
+    }
+    return data;
+  }).catch((err) => {
+    logger.logFullError(err);
+    throw errors.convertTopcoderApiError(err, `Failed to fetch project with direct id ${directId}`);
+  });
+}
 
 
 module.exports = {
@@ -448,5 +476,6 @@ module.exports = {
   unregisterUserFromChallenge,
   cancelPrivateContent,
   assignUserAsRegistrant,
-  removeResourceToChallenge
+  removeResourceToChallenge,
+  getProjectByDirectId
 };