137 update generic reports with irv winners

client/src/component/AuditReportForm.tsx

@@ -31,6 +31,7 @@ const REPORT_TYPES: ReportType[] = [
     {key:'ActivityReport', label:'Activity Report'},
     {key:'StateReport', label:'State Report'},
     {key:'JSON', label:'Json Reports'},
+    {key:'summarize_IRV', label:'IRV summaries'},
     {key:'ranked_ballot_interpretation', label:'Ranked vote interpretation'}
 ];
 
@@ -75,38 +76,42 @@ class AuditReportForm extends React.Component<FormProps, FormState> {
 
         return (
             <Popover position={Position.BOTTOM_LEFT} canEscapeKeyClose={true}
-                enforceFocus={false} >
-                <Button  large disabled={ !this.props.canRenderReport }  
-                         intent={ Intent.PRIMARY }>
-                         Choose report to download</Button>
-                <div key="text" style={{margin: "10px", minWidth: "300px", maxWidth:"370px"}}>
+                     enforceFocus={false}>
+
+                <Button large disabled={!this.props.canRenderReport} intent={Intent.PRIMARY}>
+                    Choose report to download</Button>
+                <div key="text" style={{margin: "10px", minWidth: "300px", maxWidth: "370px"}}>
                     <h5>Audit reports</h5>
                     <FormGroup>
-
-                    {REPORT_TYPES.map(ty => {
-                        let key = ty.key;
-                        let label = ty.label;
-                        return <div className='checkbox'><Checkbox key={key}
-                                  label={label}
-                                  value={key} 
-                                  checked={this.state.checkedReports[key] || false}
-                                  onChange={this.handleCheckboxChange}
-                                  style={{ minWidth: '10px', paddingLeft: '30px' }}/></div>
-                                })
-                    }
+                        {REPORT_TYPES.map(ty => {
+                            let key = ty.key;
+                            let label = ty.label;
+                            return <div className='checkbox'><Checkbox key={key}
+                                                                       label={label}
+                                                                       value={key}
+                                                                       checked={this.state.checkedReports[key] || false}
+                                                                       onChange={this.handleCheckboxChange}
+                                                                       style={{minWidth: '10px', paddingLeft: '30px'}}/>
+                            </div>
+                        })
+                        }
                     </FormGroup>
-                    <div style={{ display: "flex", justifyContent: "flex-end", marginTop: 15 }}>
-
-                        <Button className={Classes.POPOVER_DISMISS} 
-                                intent={Intent.PRIMARY} 
-                                icon='import' 
-                               onClick={() => fetchAuditReport(Object.keys(this.state.checkedReports).join(","))}
-                                >
-                            Download Report
+                    <div style={{display: "flex", flexDirection:"row", justifyContent: "space-between", marginTop: 15}}>
+                        <Button className={Classes.POPOVER_DISMISS}
+                                intent={Intent.PRIMARY}
+                                icon='import'
+                                onClick={() => fetchAuditReport(REPORT_TYPES.map(rt => rt.key).join(","))}>
+                            Download All
+                        </Button>
+                        <Button className={Classes.POPOVER_DISMISS}
+                                intent={Intent.PRIMARY}
+                                icon='import'
+                                onClick={() => fetchAuditReport(Object.keys(this.state.checkedReports).join(","))}>
+                            Download Selected
                         </Button>
-                        </div>
-                 </div>
-            </Popover> 
+                    </div>
+                </div>
+            </Popover>
 
         );
     }

client/src/component/DOS/Dashboard/Round/Control.tsx

@@ -3,6 +3,8 @@ import * as React from 'react';
 import { Button, Card, Elevation, Intent, ProgressBar } from '@blueprintjs/core';
 import startNextRound from 'corla/action/dos/startNextRound';
 import AuditReportForm from 'corla/component/AuditReportForm';
+import exportAssertionsAsJson from "corla/action/dos/exportAssertionsAsJson";
+import exportAssertionsAsCsv from "corla/action/dos/exportAssertionsAsCsv";
 
 interface ControlProps {
     canRenderReport: boolean;
@@ -39,17 +41,28 @@ class Control extends React.Component<ControlProps, ControlState>  {
                     <div>
                         <h4>Round {currentRound} completed</h4>
                         <Button intent={Intent.PRIMARY}
-                            onClick={waitForNextRound}>
+                                onClick={waitForNextRound}>
                             Start round {currentRound + 1}
                         </Button>
                     </div>
                     <div>
+                        <Button onClick={exportAssertionsAsJson} className='pt-button pt-intent-primary'>
+                            Export Assertions as JSON
+                        </Button>
+                    </div>
+                    <div>
+                        <Button onClick={exportAssertionsAsCsv} className='pt-button pt-intent-primary'>
+                            Export Assertions as CSV
+                        </Button>
+                    </div>
                     <div>
-                        {canRenderReport && (<AuditReportForm
-                            canRenderReport={canRenderReport}
-                        /> 
-                        )}
-            </div>                    </div>
+                        <div>
+                            {canRenderReport && (<AuditReportForm
+                                    canRenderReport={canRenderReport}
+                                />
+                            )}
+                        </div>
+                    </div>
                 </div>
             );
         };

client/src/component/DOS/Dashboard/Round/Status.tsx

@@ -1,5 +1,8 @@
 import * as React from 'react';
 import AuditReportForm from 'corla/component/AuditReportForm';
+import {Button, Intent} from "@blueprintjs/core";
+import exportAssertionsAsJson from "corla/action/dos/exportAssertionsAsJson";
+import exportAssertionsAsCsv from "corla/action/dos/exportAssertionsAsCsv";
 
 interface StatusProps {
     auditIsComplete: boolean;
@@ -28,6 +31,16 @@ const Status = (props: StatusProps) => {
                     have finished this round.
                 </span>
             </div>
+            <div>
+                <Button onClick={exportAssertionsAsJson} className='pt-button pt-intent-primary'>
+                    Export Assertions as JSON
+                </Button>
+            </div>
+            <div>
+                <Button onClick={exportAssertionsAsCsv} className='pt-button pt-intent-primary'>
+                    Export Assertions as CSV
+                </Button>
+            </div>
             <div>
                 {canRenderReport && (<AuditReportForm
                 canRenderReport={canRenderReport}

server/eclipse-project/src/main/java/au/org/democracydevelopers/corla/endpoint/GetAssertions.java

@@ -33,7 +33,6 @@
 
 import au.org.democracydevelopers.corla.communication.requestToRaire.GetAssertionsRequest;
 import au.org.democracydevelopers.corla.communication.responseFromRaire.RaireServiceErrors;
-import au.org.democracydevelopers.corla.query.GenerateAssertionsSummaryQueries;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
@@ -51,8 +50,6 @@
 import us.freeandfair.corla.model.DoSDashboard;
 import us.freeandfair.corla.util.SparkHelper;
 
-import static au.org.democracydevelopers.corla.endpoint.GenerateAssertions.UNKNOWN_WINNER;
-
 /**
  * The Get Assertions endpoint. Takes a GetAssertionsRequest, and an optional format parameter specifying CSV or JSON,
  * defaulting to json. Returns a zip of all assertions for all IRV contests, in the requested format.
@@ -132,11 +129,11 @@ public String endpointBody(final Request the_request, final Response the_respons
         try {
 
             final ZipOutputStream os = new ZipOutputStream(SparkHelper.getRaw(the_response).getOutputStream());
-            getAssertions(os, riskLimit, raireUrl, suffix);
 
             the_response.header("Content-Type", "application/zip");
-            the_response.header("Content-Disposition", "attachment; filename*=UTF-8''assertions.zip");
-
+            the_response.header("Content-Disposition",
+                "attachment; filename*=UTF-8''assertions_" + suffix + ".zip");
+            getAssertions(os, riskLimit, raireUrl, suffix);
             ok(the_response);
 
         } catch (URISyntaxException | MalformedURLException e) {

server/eclipse-project/src/main/java/au/org/democracydevelopers/corla/model/IRVComparisonAudit.java

@@ -22,7 +22,6 @@
 package au.org.democracydevelopers.corla.model;
 
 import au.org.democracydevelopers.corla.query.AssertionQueries;
-import au.org.democracydevelopers.corla.query.GenerateAssertionsSummaryQueries;
 import com.google.inject.internal.util.ImmutableList;
 
 import java.util.*;
@@ -35,7 +34,6 @@
 
 import au.org.democracydevelopers.corla.model.assertion.Assertion;
 
-import static au.org.democracydevelopers.corla.endpoint.GenerateAssertions.UNKNOWN_WINNER;
 import static java.util.Collections.max;
 
 /**
@@ -591,6 +589,14 @@ public ImmutableList<Assertion> getAssertions(){
     return ImmutableList.<Assertion>builder().addAll(assertions).build();
   }
 
+  /**
+   * Return the overall margin, which is the minimum margin of all the assertions.
+   * @return the minimum assertion margin.
+   */
+  public int getMinMargin() {
+    return Collections.min(assertions.stream().map(Assertion::getMargin).toList());
+  }
+
   /**
    * This method checks whether this IRVComparisonAudit's list of assertions has been
    * appropriately initialised, and throws a RunTimeException if not. It takes a string identifying

server/eclipse-project/src/main/java/au/org/democracydevelopers/corla/model/assertion/Assertion.java

@@ -258,6 +258,11 @@ public BigDecimal getDilutedMargin(){
     return dilutedMargin;
   }
 
+  /**
+   * Get the assertion's absolute margin.
+   */
+  public int getMargin() { return margin; }
+
   /**
    * Get an (unmodifiable) map of the assertion's CVR ID-discrepancy records. This is used
    * for testing purposes.

server/eclipse-project/src/main/java/au/org/democracydevelopers/corla/model/vote/IRVBallotInterpretation.java

@@ -34,7 +34,6 @@ public class IRVBallotInterpretation implements PersistentEntity {
   @Version
   private Long version;
 
-
   /**
    * The contest to which the interpreted vote belongs.
    */

server/eclipse-project/src/main/java/us/freeandfair/corla/query/ExportQueries.java

@@ -6,15 +6,19 @@
 import java.io.InputStreamReader;
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
+import java.util.*;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import au.org.democracydevelopers.corla.endpoint.AbstractAllIrvEndpoint;
+import au.org.democracydevelopers.corla.model.ContestType;
+import au.org.democracydevelopers.corla.model.GenerateAssertionsSummary;
+import au.org.democracydevelopers.corla.model.IRVComparisonAudit;
+import au.org.democracydevelopers.corla.query.GenerateAssertionsSummaryQueries;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 
@@ -29,6 +33,9 @@
 
 import org.hibernate.query.Query;
 
+import us.freeandfair.corla.model.ComparisonAudit;
+import us.freeandfair.corla.model.Contest;
+import us.freeandfair.corla.model.ContestResult;
 import us.freeandfair.corla.persistence.Persistence;
 
 /** export queries **/
@@ -120,6 +127,10 @@ public static void customOut(final String query, final OutputStream os) {
    **/
   public static void jsonOut(final String query, final OutputStream os) {
     final Session s = Persistence.currentSession();
+
+    // Make sure the contest_result table has the right info for IRV.
+    updateIRVContestResults(s);
+
     final String withoutSemi = query.replace(";", "");
     final String jsonQuery =
         String.format("SELECT cast(row_to_json(r) as text)" + " FROM (%s) r", withoutSemi);
@@ -153,6 +164,10 @@ public static void jsonOut(final String query, final OutputStream os) {
   /** send query results to output stream as csv **/
   public static void csvOut(final String query, final OutputStream os) {
     final Session s = Persistence.currentSession();
+
+    // Make sure the contest_result table has the right info for IRV.
+    updateIRVContestResults(s);
+
     final String withoutSemi = query.replace(";", "");
     s.doWork(new CSVWork(withoutSemi, os));
   }
@@ -168,7 +183,7 @@ public static List<String> getSqlFolderFiles() {
     final String[] fileNames = {"batch_count_comparison.sql", "contest.sql",
         "contest_comparison.sql", "contest_selection.sql", "contests_by_county.sql",
         "tabulate.sql", "tabulate_county.sql", "upload_status.sql", "seed.sql",
-        "ranked_ballot_interpretation.sql"};
+        "summarize_IRV.sql", "ranked_ballot_interpretation.sql"};
     for (final String f : fileNames) {
       paths.add(String.format("%s/%s", folder, f));
     }
@@ -269,4 +284,63 @@ public static long custCopyOut(final String sql, OutputStream to, CopyManager cm
     }
   }
 
+  /**
+   * This function deals, somewhat inelegantly, with the problem that the ContestResult data structure
+   * used in most queries does not have correct values for things like winners, losers, margin, and
+   * diluted margin for IRV contests. This function sets them manually from the
+   * GenerateAssertionsSummary table, then flushes the database so that the csv reports, which are
+   * based on database queries, get the right values from the contest_result table.
+   * @param s The current Hibernate session.
+   */
+  private static void updateIRVContestResults(final Session s) {
+    final String prefix = "[updateIRVContestResults]";
+    LOGGER.debug(String.format("%s %s.", prefix,
+        "Updating IRV contest results from generate assertions summary"));
+
+    final List<ComparisonAudit> comparisonAudits = ComparisonAuditQueries.sortedList();
+
+    for(final ComparisonAudit ca : comparisonAudits) {
+      if(ca instanceof IRVComparisonAudit) {
+        final Set<String> choices = new HashSet<>();
+        // Get the choices for the contest. These should be the same for all the contests, but
+        // gather the whole set from all of them just in case.
+        for(final Contest contest : ca.contestResult().getContests()) {
+          if (contest.description().equals(ContestType.IRV.toString())) {
+            contest.choices().stream().map(ch -> choices.add(ch.name()));
+          } else {
+            // We have an IRVComparisonAudit for a not-IRV contest. Definitely not supposed to happen.
+            final String msg = "IRV-type Comparison Audit encountered for non-IRV contest";
+            LOGGER.error(String.format("%s %s %s", prefix, msg, contest.name()));
+            throw new RuntimeException(msg+" "+contest.name());
+          }
+        }
+
+        final ContestResult contestResult = ca.contestResult();
+
+        // Use the choices and the summary to update the contest result in the database.
+        final Optional<GenerateAssertionsSummary> summary
+            = GenerateAssertionsSummaryQueries.matching(ca.getContestName());
+        if(summary.isPresent()) {
+          final String winner = summary.get().getWinner();
+          contestResult.setWinners(Set.of(winner));
+          choices.remove(winner);
+          contestResult.setLosers(choices);
+          contestResult.setMinMargin(((IRVComparisonAudit) ca).getMinMargin());
+          contestResult.setDilutedMargin(ca.getDilutedMargin());
+        } else {
+          // If no summary is present, just set the winner to be blank, the losers to be everyone,
+          // and the margins to be zero.
+          LOGGER.debug(String.format("%s %s %s", prefix, "Couldn't find summary for IRV contest",
+              ca.getContestName()));
+          contestResult.setWinners(Set.of());
+          contestResult.setLosers(choices);
+          contestResult.setMinMargin(0);
+          contestResult.setDilutedMargin(BigDecimal.ZERO);
+        }
+      }
+    }
+
+    s.flush();
+
+  }
 }