Skip to content

Commit 84b1317

Browse files
skwowetskwowet
committed
make the code shorter and concise
1 parent 43e0161 commit 84b1317

File tree

3 files changed

+36
-174
lines changed

3 files changed

+36
-174
lines changed

‎services/apps/script_executor_worker/src/workflows/cleanup/members.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export async function cleanupMembers(args: ICleanupArgs): Promise<void> {
3939
return excludeEntityFromCleanup(memberId, EntityType.MEMBER)
4040
}
4141

42-
console.log(`Deleting member ${memberId} from database!`)
42+
console.log(`Deleting member ${memberId} from opensearch and database!`)
4343
await syncRemoveMember(memberId)
4444
return deleteMember(memberId)
4545
})

‎services/libs/data-access-layer/src/old/apps/script_executor_worker/member.repo.ts

+17-99
Original file line numberDiff line numberDiff line change
@@ -201,106 +201,24 @@ class MemberRepository {
201201
}
202202

203203
public async deleteMember(memberId: string): Promise<void> {
204-
await this.connection.tx(async (tx) => {
205-
await tx.none(
206-
`
207-
DELETE FROM "memberEnrichmentCache"
208-
WHERE "memberId" = $(memberId)
209-
`,
210-
{
211-
memberId,
212-
},
213-
)
214-
215-
await tx.none(
216-
`
217-
DELETE FROM "memberEnrichments"
218-
WHERE "memberId" = $(memberId)
219-
`,
220-
{
221-
memberId,
222-
},
223-
)
224-
225-
await tx.none(
226-
`
227-
DELETE FROM "memberNoMerge"
228-
WHERE "memberId" = $(memberId) OR "noMergeId" = $(memberId)
229-
`,
230-
{
231-
memberId,
232-
},
233-
)
234-
235-
await tx.none(
236-
`
237-
DELETE FROM "memberSegmentAffiliations"
238-
WHERE "memberId" = $(memberId)
239-
`,
240-
{
241-
memberId,
242-
},
243-
)
244-
245-
await tx.none(
246-
`
247-
DELETE FROM "memberSegmentsAgg"
248-
WHERE "memberId" = $(memberId)
249-
`,
250-
{
251-
memberId,
252-
},
253-
)
204+
const tablesToDelete = [
205+
{ name: 'memberEnrichmentCache', conditions: ['memberId'] },
206+
{ name: 'memberEnrichments', conditions: ['memberId'] },
207+
{ name: 'memberNoMerge', conditions: ['memberId', 'noMergeId'] },
208+
{ name: 'memberSegmentAffiliations', conditions: ['memberId'] },
209+
{ name: 'memberSegmentsAgg', conditions: ['memberId'] },
210+
{ name: 'memberSegments', conditions: ['memberId'] },
211+
{ name: 'memberTags', conditions: ['memberId'] },
212+
{ name: 'memberToMerge', conditions: ['memberId', 'toMergeId'] },
213+
{ name: 'memberToMergeRaw', conditions: ['memberId', 'toMergeId'] },
214+
{ name: 'members', conditions: ['id'] },
215+
]
254216

255-
await tx.none(
256-
`
257-
DELETE FROM "memberSegments"
258-
WHERE "memberId" = $(memberId)
259-
`,
260-
{
261-
memberId,
262-
},
263-
)
264-
265-
await tx.none(
266-
`
267-
DELETE FROM "memberTags"
268-
WHERE "memberId" = $(memberId)
269-
`,
270-
{
271-
memberId,
272-
},
273-
)
274-
275-
await tx.none(
276-
`
277-
DELETE FROM "memberToMerge"
278-
WHERE "memberId" = $(memberId) OR "toMergeId" = $(memberId)
279-
`,
280-
{
281-
memberId,
282-
},
283-
)
284-
285-
await tx.none(
286-
`
287-
DELETE FROM "memberToMergeRaw"
288-
WHERE "memberId" = $(memberId) OR "toMergeId" = $(memberId)
289-
`,
290-
{
291-
memberId,
292-
},
293-
)
294-
295-
await tx.none(
296-
`
297-
DELETE FROM "members"
298-
WHERE id = $(memberId)
299-
`,
300-
{
301-
memberId,
302-
},
303-
)
217+
await this.connection.tx(async (tx) => {
218+
for (const table of tablesToDelete) {
219+
const whereClause = table.conditions.map((field) => `"${field}" = $(memberId)`).join(' OR ')
220+
await tx.none(`DELETE FROM "${table.name}" WHERE ${whereClause}`, { memberId })
221+
}
304222
})
305223
}
306224
}

‎services/libs/data-access-layer/src/old/apps/script_executor_worker/organization.repo.ts

+18-74
Original file line numberDiff line numberDiff line change
@@ -132,81 +132,25 @@ class OrganizationRepository {
132132
}
133133

134134
public async cleanupOrganization(organizationId: string): Promise<void> {
135-
await this.connection.tx(async (tx) => {
136-
await tx.none(
137-
`
138-
DELETE FROM "organizationNoMerge"
139-
WHERE "organizationId" = $(organizationId)
140-
OR "noMergeId" = $(organizationId)
141-
`,
142-
{ organizationId },
143-
)
144-
145-
await tx.none(
146-
`
147-
DELETE FROM "organizationToMerge"
148-
WHERE "organizationId" = $(organizationId)
149-
OR "toMergeId" = $(organizationId)
150-
`,
151-
{ organizationId },
152-
)
153-
154-
await tx.none(
155-
`
156-
DELETE FROM "organizationToMergeRaw"
157-
WHERE "organizationId" = $(organizationId)
158-
OR "toMergeId" = $(organizationId)
159-
`,
160-
{ organizationId },
161-
)
162-
163-
await tx.none(
164-
`
165-
DELETE FROM "memberSegmentAffiliations"
166-
WHERE "organizationId" = $(organizationId)
167-
`,
168-
{ organizationId },
169-
)
170-
171-
await tx.none(
172-
`
173-
DELETE FROM "organizationSegmentsAgg"
174-
WHERE "organizationId" = $(organizationId)
175-
`,
176-
{ organizationId },
177-
)
178-
179-
await tx.none(
180-
`
181-
DELETE FROM "organizationSegments"
182-
WHERE "organizationId" = $(organizationId)
183-
`,
184-
{ organizationId },
185-
)
186-
187-
await tx.none(
188-
`
189-
DELETE FROM "orgAttributes"
190-
WHERE "organizationId" = $(organizationId)
191-
`,
192-
{ organizationId },
193-
)
194-
195-
await tx.none(
196-
`
197-
DELETE FROM "organizationIdentities"
198-
WHERE "organizationId" = $(organizationId)
199-
`,
200-
{ organizationId },
201-
)
135+
const tablesToDelete = [
136+
{ name: 'organizationNoMerge', conditions: ['organizationId', 'noMergeId'] },
137+
{ name: 'organizationToMerge', conditions: ['organizationId', 'toMergeId'] },
138+
{ name: 'organizationToMergeRaw', conditions: ['organizationId', 'toMergeId'] },
139+
{ name: 'memberSegmentAffiliations', conditions: ['organizationId'] },
140+
{ name: 'organizationSegmentsAgg', conditions: ['organizationId'] },
141+
{ name: 'organizationSegments', conditions: ['organizationId'] },
142+
{ name: 'orgAttributes', conditions: ['organizationId'] },
143+
{ name: 'organizationIdentities', conditions: ['organizationId'] },
144+
{ name: 'organizations', conditions: ['id'] },
145+
]
202146

203-
await tx.none(
204-
`
205-
DELETE FROM organizations
206-
WHERE id = $(organizationId)
207-
`,
208-
{ organizationId },
209-
)
147+
await this.connection.tx(async (tx) => {
148+
for (const table of tablesToDelete) {
149+
const whereClause = table.conditions
150+
.map((field) => `"${field}" = $(organizationId)`)
151+
.join(' OR ')
152+
await tx.none(`DELETE FROM "${table.name}" WHERE ${whereClause}`, { organizationId })
153+
}
210154
})
211155
}
212156

0 commit comments

Comments
 (0)