diff --git a/pkg/coredata/document_version_approval_decision.go b/pkg/coredata/document_version_approval_decision.go index 1ea86efca..fc86a61cb 100644 --- a/pkg/coredata/document_version_approval_decision.go +++ b/pkg/coredata/document_version_approval_decision.go @@ -437,6 +437,13 @@ WITH next_group AS ( AND doc.deleted_at IS NULL AND doc.archived_at IS NULL ) + AND EXISTS ( + SELECT 1 + FROM iam_membership_profiles p + WHERE p.id = document_version_approval_decisions.approver_id + AND p.state = @recipient_state::membership_state + AND (p.contract_end_date IS NULL OR p.contract_end_date >= @now::date) + ) GROUP BY organization_id, approver_id @@ -479,6 +486,7 @@ ORDER BY args := pgx.StrictNamedArgs{ "state": DocumentVersionApprovalDecisionStatePending, + "recipient_state": ProfileStateActive, "max_notifications": documentNotificationMaxCount, "now": now, "debounce_before": debounceBefore, diff --git a/pkg/coredata/document_version_signature.go b/pkg/coredata/document_version_signature.go index c34fbe3bc..54205c9c5 100644 --- a/pkg/coredata/document_version_signature.go +++ b/pkg/coredata/document_version_signature.go @@ -461,6 +461,13 @@ WITH next_group AS ( AND doc.deleted_at IS NULL AND doc.archived_at IS NULL ) + AND EXISTS ( + SELECT 1 + FROM iam_membership_profiles p + WHERE p.id = document_version_signatures.signed_by_profile_id + AND p.state = @recipient_state::membership_state + AND (p.contract_end_date IS NULL OR p.contract_end_date >= @now::date) + ) GROUP BY organization_id, signed_by_profile_id @@ -502,6 +509,7 @@ ORDER BY args := pgx.StrictNamedArgs{ "state": DocumentVersionSignatureStateRequested, + "recipient_state": ProfileStateActive, "max_notifications": documentNotificationMaxCount, "now": now, "debounce_before": debounceBefore,