Changes for August release challenge

topcoder-archive/topcoder-platform-topcoder-x-ui#316
topcoder-archive/topcoder-platform-topcoder-x-ui#415
topcoder-archive/topcoder-platform-topcoder-x-ui#422

Author: jmgasper

models/Project.js

@@ -23,7 +23,10 @@ const schema = new Schema({
     type: Number,
     required: true
   },
-  repoUrl: {type: String, required: true},
+  repoUrls: {
+    type: [String],
+    required: true
+  },
   repoId: {type: String, required: false},
   rocketChatWebhook: {type: String, required: false},
   rocketChatChannelName: {type: String, required: false},

routes/middlewares/RepositoryFilter.js

@@ -26,7 +26,7 @@ module.exports = (provider) => async (req, res, next) => {
   const projects = await dbHelper.scan(Project, {
     archived: 'false'
   });
-  const found = _.some(projects, (project) => _.includes(repoNames, project.repoUrl));
+  const found = _.some(projects, (project) => _.intersection(repoNames, project.repoUrls).length > 0);
   if (found) {
     return next();
   }

routes/middlewares/SecurityChecker.js

@@ -19,7 +19,7 @@ module.exports = (provider) => async (req, res, next) => {
   const params = req.body;
   if (provider === 'github') {
     const projectDetails = await dbHelper.scan(Project, {
-      repoUrl: params.repository.html_url
+      repoUrls: { contains: params.repository.html_url }
     });
     _.forEach(projectDetails, (projectDetail) => {
       const hash = crypto.createHmac('sha1', projectDetail.secretWebhookKey).update(req.rawBody).digest('hex');
@@ -29,7 +29,7 @@ module.exports = (provider) => async (req, res, next) => {
     });
   } else if (provider === 'gitlab') {
     const projectDetails = await dbHelper.scan(Project, {
-      repoUrl: params.project.web_url
+      repoUrls: { contains: params.project.web_url }
     });
     _.forEach(projectDetails, (projectDetail) => { // eslint-disable-line lodash/prefer-filter
       if (projectDetail.secretWebhookKey === req.header('X-Gitlab-Token')) {

scripts/create-update-tables.js

@@ -29,7 +29,7 @@
  */
 async function pingTable(model) {
   return new Promise((resolve, reject) => {
-    if (!(model.scan && typeof model.scan == 'function' && model.scan({}).exec)) {
+    if (!(model.scan && typeof model.scan === 'function' && model.scan({}).exec)) {
       return resolve();
     }
     model.scan({id: 0}).exec((err, result) => {
@@ -40,4 +40,4 @@ async function pingTable(model) {
       return resolve();
     });
   });
-}
+}

utils/db-helper.js

@@ -28,4 +28,4 @@ async function scan(model, scanParams) {
 
 module.exports = {
   scan
-};
+};