Commit ab4e4357 authored by juga's avatar juga
Browse files

chg: report: Allow to report on individual bw files 

depending on the dates, instead of to report on all the bw files for a
consensus.
parent 74d01502

bwauthealth/report.py

+28 −29
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ import logging 
from django.conf import settings



from . import util

from .models.bwfile import BwFile

from .models.consensus import Consensus



logger = logging.getLogger(__name__)
@@ -31,13 +32,12 @@ def report(start=None, end=None): 
        end = util.end_dt(start)

    logger.info("Time period from %s to %s", start, end)

    rows = []

    consensuses = Consensus.objects.filter(

        valid_after__gte=start, valid_after__lt=end

    bwfiles = BwFile.objects.filter(

        file_created__gte=start, file_created__lt=end

    )

    for consensus in consensuses:

        logger.debug("Consensus %s", consensus)

        for bwfile in consensus.bwfiles():

    for bwfile in bwfiles:

        logger.debug("Bw desc %s", bwfile)

        consensus = Consensus.objects.get(bwfile=bwfile)

        row = [

            consensus,

            bwfile,
@@ -66,13 +66,12 @@ def missing_relays(start=None, end=None): 
        end = util.end_dt(start)

    logger.info("Time period from %s to %s", start, end)

    rows = []

    consensuses = Consensus.objects.filter(

        valid_after__gte=start, valid_after__lt=end

    bwfiles = BwFile.objects.filter(

        file_created__gte=start, file_created__lt=end

    )

    for consensus in consensuses:

        logger.debug("Consensus %s", consensus)

        for bwfile in consensus.bwfiles():

    for bwfile in bwfiles:

        logger.debug("Bw desc %s", bwfile)

        consensus = Consensus.objects.get(bwfile=bwfile)

        for fp, nickname in bwfile.consensus_relays_not_in_bwdesc():

            row = [consensus, bwfile, fp, nickname]

            rows.append(row)