Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

Version 1.2.1 #434

Merged
merged 6 commits into from
Sep 10, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
#432 fix registeredWebhookId missing in the update project function.
  • Loading branch information
afrisalyp committed Sep 9, 2021
commit a04dca2614b839160ce230de0c1fb974caf8331e
13 changes: 12 additions & 1 deletion src/services/ProjectService.js
Original file line number Diff line number Diff line change
Expand Up @@ -202,15 +202,20 @@ async function update(project, currentUser) {
return item;
});
const oldRepositories = await dbHelper.queryRepositoriesByProjectId(dbProject.id);
const weebhookIds = {};
for (const repo of oldRepositories) { // eslint-disable-line
if (repo.registeredWebhookId) {
weebhookIds[repo.url] = repo.registeredWebhookId;
}
await dbHelper.removeById(models.Repository, repo.id);
}
for (const repoUrl of repoUrls) { // eslint-disable-line no-restricted-syntax
await dbHelper.create(models.Repository, {
id: helper.generateIdentifier(),
projectId: dbProject.id,
url: repoUrl,
archived: project.archived
archived: project.archived,
registeredWebhookId: weebhookIds[repoUrl]
})
}
dbProject.updatedAt = new Date();
Expand Down Expand Up @@ -542,6 +547,12 @@ async function createHook(body, currentUser, repoUrl) {
_.find(hooks, {id: parseInt(dbRepo.registeredWebhookId, 10)})) {
await client.ProjectHooks.remove(`${repoOwner}/${repoName}`, dbRepo.registeredWebhookId);
}
for (const currentHook of hooks) { // eslint-disable-line no-restricted-syntax
if (currentHook.id !== parseInt(dbRepo.registeredWebhookId, 10) &&
currentHook.url === `${config.HOOK_BASE_URL}/webhooks/gitlab`) {
await client.ProjectHooks.remove(`${repoOwner}/${repoName}`, currentHook.id);
}
}
const hook = await client.ProjectHooks.add(`${repoOwner}/${repoName}`,
`${config.HOOK_BASE_URL}/webhooks/gitlab`, {
push_events: true,
Expand Down