5fbce37c1f6f078e410979b69c8f97a42d89de28,foreman/data_refinery_foreman/foreman/management/commands/retry_samples.py,,retry_computed_files_not_uploaded,#,94

Before Change

    logger.info("Re-queued %d samples that had failed with the pattern %s.", total_samples_queued, pattern)

def retry_computed_files_not_uploaded():
    samples_with_results = Sample.objects.filter(results__computedfile__s3_bucket__isnull=True).values("id")

    samples_with_computed_files = Sample.objects.filter(computed_files__s3_bucket__isnull=True).values("id")

    sample_ids = {s["id"] for s in samples_with_results} | {s["id"] for s in samples_with_computed_files}

    eligible_samples = Sample.objects.filter(id__in=sample_ids)

After Change

        .filter(s3_bucket__isnull=True, samples__isnull=False)\
        .values_list("samples", flat=True)

    samples_with_results = ComputedFile.objects\
        .filter(s3_bucket__isnull=True, result__samples__isnull=False)\
        .values_list("result__samples", flat=True)

    sample_ids = set(samples_with_results) | set(samples_with_computed_files)

    eligible_samples = Sample.objects.filter(id__in=sample_ids)

    total_samples_queued = requeue_samples(eligible_samples)

Instances