Merge pull request #451 from 52cs/issue-448-fix

small fix on PR #449 for issue #448

Author: jmgasper

src/controllers/GitlabController.js

@@ -263,7 +263,7 @@ async function deleteUsersFromTeam(req, res) {
   // If groupInDB not exists, then just return
   if (groupInDB) {
     try {
-      const ownerUser = await helper.queryOneUserByTypeAndRole(User,
+      const ownerUser = await dbHelper.queryOneUserByTypeAndRole(User,
         groupInDB.ownerUsername, constants.USER_TYPES.GITLAB, constants.USER_ROLES.OWNER);
       if (!ownerUser) {
         throw new errors.NotFoundError('The owner user is not found or not accessible.');

src/services/ProjectService.js

@@ -150,8 +150,11 @@ async function _createOrMigrateRepository(repoUrl, project, currentUser) {
       await dbHelper.update(models.Repository, oldRepo.id, {projectId: project.id, archived: false});
       await Promise.all(issueIds.map(issueId => dbHelper.update(models.Issue, issueId, {projectId: project.id})));
       await Promise.all(
-        paymentIds.map(paymentId => dbHelper.update(models.CopilotPayment, paymentId, {project: project.id}))
+        paymentIds.filter(paymentId => paymentId)
+          .map(paymentId => dbHelper.update(models.CopilotPayment, paymentId, {project: project.id}))
       );
+
+      await createHook({projectId: project.id}, currentUser, repoUrl);
     }
     catch (err) {
       throw new Error(`Update ProjectId for Repository, Issue, CopilotPayment failed. Repo ${repoUrl}. Internal Error: ${err}`);