Skip to content
This repository was archived by the owner on Jun 3, 2024. It is now read-only.

Fix intersecting groups for all_distinct #81

Merged
joao-paulo-parity merged 2 commits into from
Apr 12, 2022
Merged

Fix intersecting groups for all_distinct #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dc6728
fix intersecting groups for all_distinct
joao-paulo-parity Apr 12, 2022
1c983f1
for of
joao-paulo-parity Apr 12, 2022
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
50 changes: 19 additions & 31 deletions src/core.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,63 +472,53 @@ export const runChecks = async function (
const ruleApprovedBy: Set<string> = new Set()
const subconditionsUsersToAskForReview: Set<string> = new Set()

const failedSubconditions: Array<number | string> = []
toNextSubcondition: for (
let i = 0;
i < rule.subConditions.length;
i++
) {
toNextSubcondition: for (const subCondition of rule.subConditions) {
const pendingUsersToAskForReview: Set<string> = new Set()

const subCondition = rule.subConditions[i]
let approvalCount = 0
for (const user of subCondition.users ?? []) {
pendingUsersToAskForReview.add(user)
if (approvedBy.has(user) && !ruleApprovedBy.has(user)) {
if (approvedBy.has(user)) {
ruleApprovedBy.add(user)
approvalCount++
if (approvalCount === subCondition.min_approvals) {
continue toNextSubcondition
if (ruleApprovedBy.size === rule.min_approvals) {
subconditionsUsersToAskForReview.clear()
break toNextSubcondition
}
} else {
pendingUsersToAskForReview.add(user)
}
}

for (const team of subCondition.teams ?? []) {
for (const [user, userInfo] of rule.users) {
if (userInfo?.teamsHistory?.has(team)) {
pendingUsersToAskForReview.add(user)
if (approvedBy.has(user) && !ruleApprovedBy.has(user)) {
if (approvedBy.has(user)) {
ruleApprovedBy.add(user)
approvalCount++
if (approvalCount === subCondition.min_approvals) {
continue toNextSubcondition
if (ruleApprovedBy.size === rule.min_approvals) {
subconditionsUsersToAskForReview.clear()
break toNextSubcondition
}
} else {
pendingUsersToAskForReview.add(user)
}
}
}
}

for (const user of pendingUsersToAskForReview) {
subconditionsUsersToAskForReview.add(user)
}
failedSubconditions.push(
typeof subCondition.name === "string"
? `"${subCondition.name}"`
: `at index ${i}`,
)
}

if (failedSubconditions.length) {
if (subconditionsUsersToAskForReview.size === 0) {
outcomes.push(new RuleSuccess(rule))
} else {
const usersToAskForReview: Map<string, RuleUserInfo> = new Map(
Array.from(rule.users.entries()).filter(function ([username]) {
return !approvedBy.has(username)
}),
)
const problem = `Rule "${rule.name}" needs in total ${
rule.min_approvals
} DISTINCT approvals, meaning users whose approvals counted towards one criterion are excluded from other criteria. For example: even if a user belongs multiple teams, their approval will only count towards one of them; or even if a user is referenced in multiple subconditions, their approval will only count towards one subcondition. Subcondition${
failedSubconditions.length > 1 ? "s" : ""
} ${failedSubconditions.join(
" and ",
)} failed. The following users have not approved yet: ${Array.from(
} DISTINCT approvals, meaning users whose approvals counted towards one criterion are excluded from other criteria. For example: even if a user belongs multiple teams, their approval will only count towards one of them; or even if a user is referenced in multiple subconditions, their approval will only count towards one subcondition. The following users have not approved yet: ${Array.from(
usersToAskForReview.entries(),
)
.filter(function ([username]) {
Expand All @@ -539,8 +529,6 @@ export const runChecks = async function (
})
.join(", ")}.`
outcomes.push(new RuleFailure(rule, problem, usersToAskForReview))
} else {
outcomes.push(new RuleSuccess(rule))
}
} else if (approvedBy.size < rule.min_approvals) {
const usersToAskForReview: Map<string, RuleUserInfo> = new Map(
Expand Down
Loading