Skip to content

Commit 3891f6a

Browse files
committed
chore: deprecate activityTasks and activities tables in postgres
Signed-off-by: Uroš Marolt <uros@marolt.me>
1 parent 5ad2fd2 commit 3891f6a

9 files changed

Lines changed: 10 additions & 811 deletions

File tree

backend/src/bin/scripts/fix-auto-merged-orgs.ts

Lines changed: 0 additions & 326 deletions
This file was deleted.

backend/src/database/migrations/U1778146717__drop-activities-and-activity-tasks.sql

Whitespace-only changes.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
DROP TABLE IF EXISTS "activityTasks";
2+
DROP TABLE IF EXISTS "activities";

backend/src/database/repositories/memberRepository.ts

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -937,12 +937,12 @@ class MemberRepository {
937937
})
938938

939939
if (data.length > 0 && data[0].memberId !== record.id) {
940-
let memberSegment = (await seq.query(
940+
const memberSegment = (await seq.query(
941941
`
942-
select distinct a."segmentId", a."memberId"
943-
from activities a where a."memberId" = :memberId
944-
limit 1
945-
`,
942+
select distinct ms."segmentId", ms."memberId"
943+
from "memberSegments" ms where ms."memberId" = :memberId
944+
limit 1
945+
`,
946946
{
947947
replacements: {
948948
memberId: data[0].memberId,
@@ -952,27 +952,8 @@ class MemberRepository {
952952
},
953953
)) as any[]
954954

955-
// if there's no activity for the member, check memberSegments table
956-
if (memberSegment.length === 0) {
957-
memberSegment = (await seq.query(
958-
`
959-
select distinct ms."segmentId", ms."memberId"
960-
from "memberSegments" ms where ms."memberId" = :memberId
961-
limit 1
962-
`,
963-
{
964-
replacements: {
965-
memberId: data[0].memberId,
966-
},
967-
type: QueryTypes.SELECT,
968-
transaction,
969-
},
970-
)) as any[]
971-
972-
// still not found, throw an error
973-
if (!memberSegment) {
974-
throw new Error('Member with same identity already exists!')
975-
}
955+
if (!memberSegment) {
956+
throw new Error('Member with same identity already exists!')
976957
}
977958

978959
const segmentInfo = (await seq.query(

0 commit comments

Comments
 (0)