Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
3 changes: 3 additions & 0 deletions api/features/workflows/core/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,9 @@ def is_approved(self) -> bool:
return self.is_approved_via_environment()
return self.is_approved_via_project()

def has_approvals(self) -> bool:
return self.approvals.filter(approved_at__isnull=False).exists()

def is_approved_via_project(self) -> bool:
return self.project.minimum_change_request_approvals is None or (
self.approvals.filter(approved_at__isnull=False).count()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,42 @@ def test_change_request_is_approved__minimum_approvals_is_none__returns_true( #
assert result is True


def test_change_request_has_approvals__approved_approval__returns_true(
change_request_no_required_approvals: ChangeRequest,
) -> None:
# Given
approver = FFAdminUser.objects.create(email="approver@example.com")
ChangeRequestApproval.objects.create(
user=approver,
change_request=change_request_no_required_approvals,
approved_at=timezone.now(),
)

# When
result = change_request_no_required_approvals.has_approvals()

# Then
assert result is True


def test_change_request_has_approvals__pending_approval_only__returns_false(
change_request_no_required_approvals: ChangeRequest,
) -> None:
# Given
assignee = FFAdminUser.objects.create(email="assignee@example.com")
ChangeRequestApproval.objects.create(
user=assignee,
change_request=change_request_no_required_approvals,
approved_at=None,
)

# When
result = change_request_no_required_approvals.has_approvals()

# Then
assert result is False


def test_change_request_commit__not_approved__raises_exception( # type: ignore[no-untyped-def]
change_request_1_required_approvals,
):
Expand Down
Loading