Skip to content

Commit 2012ef2

Browse files
committed
organization merge suggestion endpoints
1 parent be06c96 commit 2012ef2

File tree

15 files changed

+409
-128
lines changed

15 files changed

+409
-128
lines changed

backend/src/api/organization/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ export default (app) => {
2525
`/tenant/:tenantId/org/organization-merge-suggestions`,
2626
safeWrap(require('./organizationGenerateMergeMembers').default),
2727
)
28-
// app.put(
29-
// `/tenant/:tenantId/organization/:organizationId/no-merge`,
30-
// safeWrap(require('./organizationNoMerge').default),
31-
// )
28+
app.put(
29+
`/tenant/:tenantId/organization/:organizationId/no-merge`,
30+
safeWrap(require('./organizationNotMerge').default),
31+
)
3232
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import OrganizationService from '@/services/organizationService'
2+
import Permissions from '../../security/permissions'
3+
import track from '../../segment/track'
4+
import PermissionChecker from '../../services/user/permissionChecker'
5+
6+
export default async (req, res) => {
7+
new PermissionChecker(req).validateHas(Permissions.values.organizationEdit)
8+
await new OrganizationService(req).addToNoMerge(
9+
req.params.organizationId,
10+
req.body.organizationToNotMerge,
11+
)
12+
13+
track('Ignore merge members', {}, { ...req })
14+
15+
await req.responseHandler.success(req, res, { status: 200 })
16+
}

backend/src/api/tenant/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export default (app) => {
1616
app.get(`/tenant/url`, safeWrap(require('./tenantFind').default))
1717
app.get(`/tenant/:id`, safeWrap(require('./tenantFind').default))
1818
app.get(`/tenant/:tenantId/membersToMerge`, safeWrap(require('./tenantMembersToMerge').default))
19+
app.get(`/tenant/:tenantId/organizationsToMerge`, safeWrap(require('./tenantOrganizationsToMerge').default))
1920
app.post(`/tenant/:tenantId/sampleData`, safeWrap(require('./tenantGenerateSampleData').default))
2021
app.delete(`/tenant/:tenantId/sampleData`, safeWrap(require('./tenantDeleteSampleData').default))
2122
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import Error403 from '../../errors/Error403'
2+
import TenantService from '../../services/tenantService'
3+
4+
export default async (req, res) => {
5+
if (!req.currentUser || !req.currentUser.id) {
6+
throw new Error403(req.language)
7+
}
8+
9+
const payload = await new TenantService(req).findOrganizationsToMerge(req.query)
10+
11+
await req.responseHandler.success(req, res, payload)
12+
}

0 commit comments

Comments
 (0)