Skip to content
Merged
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export async function runMemberAffiliationsUpdate(

type Condition = {
when: string[]
orgId: string
orgId: string | null
matches: (activity: IDbActivityCreateData) => boolean
}

Expand All @@ -58,10 +58,11 @@ export async function runMemberAffiliationsUpdate(
"organizationId",
"dateStart",
"dateEnd",
"createdAt"
"createdAt",
"deletedAt"
FROM "memberOrganizations"
WHERE "memberId" = $(memberId)
AND "deletedAt" IS NULL
AND "deletedAt" IS NULL
Comment thread
skwowet marked this conversation as resolved.
Outdated
Comment thread
skwowet marked this conversation as resolved.
Outdated
ORDER BY "dateStart" DESC
`,
{ memberId },
Expand Down Expand Up @@ -143,15 +144,18 @@ export async function runMemberAffiliationsUpdate(
}

async function insertIfMatches(activity: IDbActivityCreateData) {
for (const condition of orgCases) {
if (!condition.matches(activity)) {
continue
}
activity.organizationId = null

activity.organizationId = condition.orgId
await insertActivities([activity])
return
if (orgCases.length > 0) {
for (const condition of orgCases) {
if (condition.matches(activity)) {
activity.organizationId = condition.orgId
break
}
}
}

await insertActivities([activity])
}

const qs = new QueryStream(
Expand Down