|
1 | | -import { CommonMemberService } from '@crowd/common_services' |
| 1 | +import { CommonMemberService, invalidateMemberQueryCache } from '@crowd/common_services' |
2 | 2 | import { optionsQx } from '@crowd/data-access-layer' |
3 | 3 |
|
4 | | -import MemberService from '@/services/memberService' |
5 | | - |
6 | 4 | import Permissions from '../../security/permissions' |
7 | 5 | import track from '../../segment/track' |
8 | 6 | import PermissionChecker from '../../services/user/permissionChecker' |
9 | 7 |
|
10 | 8 | export default async (req, res) => { |
11 | 9 | new PermissionChecker(req).validateHas(Permissions.values.memberEdit) |
12 | 10 |
|
13 | | - const commonMemberService = new CommonMemberService(optionsQx(req), req.temporal, req.log) |
14 | | - const memberService = new MemberService(req) |
| 11 | + const { memberId } = req.params |
| 12 | + const { memberToMerge } = req.body |
| 13 | + |
| 14 | + const service = new CommonMemberService(optionsQx(req), req.temporal, req.log) |
15 | 15 |
|
16 | | - const payload = await commonMemberService.merge(req.params.memberId, req.body.memberToMerge, req) |
| 16 | + const payload = await service.merge(memberId, memberToMerge, req) |
17 | 17 |
|
18 | | - // Invalidate member query cache after merge |
19 | 18 | try { |
20 | | - await memberService.invalidateMemberQueryCache([req.params.memberId, req.body.memberToMerge]) |
21 | | - req.log.debug('Invalidated member query cache after merge') |
| 19 | + await invalidateMemberQueryCache(req.redis, [memberId, memberToMerge]) |
22 | 20 | } catch (error) { |
23 | | - // Don't fail the merge if cache invalidation fails |
24 | | - req.log.warn('Failed to invalidate member query cache after merge', { error }) |
| 21 | + req.log.warn({ error }, 'Cache invalidation failed after member merge') |
25 | 22 | } |
26 | 23 |
|
27 | | - track( |
28 | | - 'Merge members', |
29 | | - { memberId: req.params.memberId, memberToMergeId: req.body.memberToMerge }, |
30 | | - { ...req }, |
31 | | - ) |
32 | | - |
33 | | - const status = payload.status || 200 |
| 24 | + track('Merge members', { memberId, memberToMergeId: memberToMerge }, req) |
34 | 25 |
|
35 | | - await req.responseHandler.success(req, res, payload, status) |
| 26 | + return req.responseHandler.success(req, res, payload, payload.status ?? 200) |
36 | 27 | } |
0 commit comments