Skip to content

related organization fix #439

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

Merged
joffinjoy merged 1 commit into from
Mar 15, 2024
Merged

related organization fix #439

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
14 changes: 10 additions & 4 deletions src/services/organization.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ module.exports = class OrganizationsHelper {
}
}

static async addRelatedOrg(id, relatedOrgs) {
static async addRelatedOrg(id, relatedOrgs = []) {
try {
// fetch organization details before update
const orgDetailsBeforeUpdate = await organizationQueries.findOne({ id })
Expand All @@ -377,7 +377,7 @@ module.exports = class OrganizationsHelper {
})
}
// append related organizations and make sure it is unique
let newRelatedOrgs = [...new Set([...orgDetailsBeforeUpdate?.related_orgs, ...relatedOrgs])]
let newRelatedOrgs = [...new Set([...(orgDetailsBeforeUpdate?.related_orgs ?? []), ...relatedOrgs])]

// check if there are any addition to related_org
if (!_.isEqual(orgDetailsBeforeUpdate?.related_orgs, newRelatedOrgs)) {
Expand Down Expand Up @@ -418,7 +418,7 @@ module.exports = class OrganizationsHelper {
throw error
}
}
static async removeRelatedOrg(id, relatedOrgs) {
static async removeRelatedOrg(id, relatedOrgs = []) {
try {
// fetch organization details before update
const orgDetailsBeforeUpdate = await organizationQueries.findOne({ id })
Expand All @@ -429,7 +429,13 @@ module.exports = class OrganizationsHelper {
message: 'ORGANIZATION_NOT_FOUND',
})
}

if (orgDetailsBeforeUpdate?.related_orgs == null) {
return responses.failureResponse({
statusCode: httpStatusCode.not_acceptable,
responseCode: 'CLIENT_ERROR',
message: 'RELATED_ORG_REMOVAL_FAILED',
})
}
const relatedOrganizations = _.difference(orgDetailsBeforeUpdate?.related_orgs, relatedOrgs)

// check if the given org ids are present in the organization's related org
Expand Down