Skip to content

Commit 0e87f0e

Browse files
authored
fix: memberTags usage in leftover operations (#3438)
Signed-off-by: Joana Maia <jmaia@contractor.linuxfoundation.org>
1 parent a2cfcdb commit 0e87f0e

4 files changed

Lines changed: 0 additions & 63 deletions

File tree

services/libs/data-access-layer/src/old/apps/automations_worker/data.repo.ts

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -240,20 +240,6 @@ export class DataRepository extends RepositoryBase<DataRepository> {
240240
)
241241
}
242242

243-
// load tags
244-
promises.push(
245-
this.getMemberTags(memberIds).then((tags) => {
246-
for (const member of results) {
247-
member.tags = tags
248-
.filter((t) => t.memberId === member.id)
249-
.map((t) => {
250-
delete t.memberId
251-
return t
252-
})
253-
}
254-
}),
255-
)
256-
257243
// load no merge
258244
promises.push(
259245
this.getMemberNoMerge(memberIds).then((noMerges) => {
@@ -388,23 +374,6 @@ export class DataRepository extends RepositoryBase<DataRepository> {
388374
return results
389375
}
390376

391-
async getMemberTags(memberIds: string[]): Promise<any[]> {
392-
const results = await this.db().any(
393-
`
394-
select mt."memberId", t.*
395-
from "memberTags" mt
396-
inner join tags t on t.id = mt."tagId"
397-
where mt."memberId" in ($(memberIds:csv))
398-
and t."deletedAt" is null;
399-
`,
400-
{
401-
memberIds,
402-
},
403-
)
404-
405-
return results
406-
}
407-
408377
async getMemberIdentities(memberIds: string[]): Promise<IMemberIdentity[]> {
409378
const results = await this.db().any(
410379
`

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,6 @@ export class MemberRepository extends RepositoryBase<MemberRepository> {
7979
where mnm."memberId" = $(id)
8080
and m2."deletedAt" is null
8181
group by mnm."memberId"),
82-
member_tags as (select mt."memberId",
83-
json_agg(
84-
json_build_object(
85-
'id', t.id,
86-
'name', t.name
87-
)
88-
) as all_tags,
89-
jsonb_agg(t.id) as all_ids
90-
from "memberTags" mt
91-
inner join tags t on mt."tagId" = t.id
92-
where mt."memberId" = $(id)
93-
and t."deletedAt" is null
94-
group by mt."memberId"),
9582
member_organizations as (select mo."memberId",
9683
os."segmentId",
9784
json_agg(
@@ -157,7 +144,6 @@ export class MemberRepository extends RepositoryBase<MemberRepository> {
157144
158145
i.identities,
159146
coalesce(mo.all_organizations, json_build_array()) as organizations,
160-
coalesce(mt.all_tags, json_build_array()) as tags,
161147
coalesce(tmd.to_merge_ids, array []::text[]) as "toMergeIds",
162148
coalesce(nmd.no_merge_ids, array []::text[]) as "noMergeIds"
163149
from "memberSegments" ms
@@ -166,7 +152,6 @@ export class MemberRepository extends RepositoryBase<MemberRepository> {
166152
inner join activity_data ad on ms."memberId" = ad."memberId" and ms."segmentId" = ad."segmentId"
167153
left join to_merge_data tmd on m.id = tmd."memberId"
168154
left join no_merge_data nmd on m.id = nmd."memberId"
169-
left join member_tags mt on ms."memberId" = mt."memberId"
170155
left join member_organizations mo on ms."memberId" = mo."memberId" and ms."segmentId" = mo."segmentId"
171156
where ms."memberId" = $(id)
172157
and m."deletedAt" is null;`,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ class MemberRepository {
208208
{ name: 'memberSegmentAffiliations', conditions: ['memberId'] },
209209
{ name: 'memberSegmentsAgg', conditions: ['memberId'] },
210210
{ name: 'memberSegments', conditions: ['memberId'] },
211-
{ name: 'memberTags', conditions: ['memberId'] },
212211
{ name: 'memberToMerge', conditions: ['memberId', 'toMergeId'] },
213212
{ name: 'memberToMergeRaw', conditions: ['memberId', 'toMergeId'] },
214213
{ name: 'members', conditions: ['id'] },

services/libs/opensearch/src/repo/member.repo.ts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -105,20 +105,6 @@ export class MemberRepository extends RepositoryBase<MemberRepository> {
105105
where mnm."memberId" = $(memberId)
106106
and m2."deletedAt" is null
107107
group by mnm."memberId"),
108-
member_tags as (
109-
select mt."memberId",
110-
json_agg(
111-
json_build_object(
112-
'id', t.id,
113-
'name', t.name
114-
)
115-
) as all_tags,
116-
jsonb_agg(t.id) as all_ids
117-
from "memberTags" mt
118-
inner join tags t on mt."tagId" = t.id
119-
where mt."memberId" = $(memberId)
120-
and t."deletedAt" is null
121-
group by mt."memberId"),
122108
member_organizations as (
123109
select mo."memberId",
124110
json_agg(
@@ -192,15 +178,13 @@ export class MemberRepository extends RepositoryBase<MemberRepository> {
192178
193179
coalesce(i.identities, '[]'::json) as "identities",
194180
coalesce(mo.all_organizations, json_build_array()) as organizations,
195-
coalesce(mt.all_tags, json_build_array()) as tags,
196181
coalesce(ma.all_affiliations, json_build_array()) as affiliations,
197182
coalesce(tmd.to_merge_ids, array []::text[]) as "toMergeIds",
198183
coalesce(nmd.no_merge_ids, array []::text[]) as "noMergeIds"
199184
from members m
200185
inner join identities i on m.id = i."memberId"
201186
left join to_merge_data tmd on m.id = tmd."memberId"
202187
left join no_merge_data nmd on m.id = nmd."memberId"
203-
left join member_tags mt on m.id = mt."memberId"
204188
left join member_affiliations ma on m.id = ma."memberId"
205189
left join member_organizations mo on m.id = mo."memberId"
206190
where m.id = $(memberId)

0 commit comments

Comments
 (0)