Skip to content

Fix/circular dependency org webhook repo #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lfrancke wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −2
Open

Fix/circular dependency org webhook repo #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/server/src/services/org.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ const Org = mongoose.model('Org');

const github = require('./github')
const logger = require('./logger')
const webhookService = require('./webhook')

const selection = function (args) {
const selectArguments = args.orgId ? { orgId: args.orgId } : { org: args.org };
Expand Down Expand Up @@ -93,6 +92,8 @@ class OrgService {
logger.info('done!')

// remove webhook from organization
// Lazy require to avoid circular dependency: org -> webhook -> repo -> org
const webhookService = require('./webhook')
try {
await webhookService.removeOrgHook(org.org, appToken)
} catch(error) {
Expand Down
3 changes: 2 additions & 1 deletion src/server/src/services/repo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ const _ = require('lodash')
const github = require('../services/github')
const logger = require('../services/logger')
const orgService = require('../services/org')
const webhookService = require('../services/webhook')

//queries
const queries = require('../graphQueries/github')
Expand Down Expand Up @@ -226,6 +225,8 @@ class RepoService {
logger.info('done!')

// remove webhook
// Lazy require to avoid circular dependency: repo -> webhook -> repo
const webhookService = require('../services/webhook')
try {
await webhookService.removeRepoHook(args.owner, args.repo, appToken)
} catch(error) {
Expand Down