Standardize CVR identification across audit logs and RCTab output

src/main/java/network/brightspots/rcv/BaseCvrReader.java

@@ -56,6 +56,7 @@ public void runAdditionalValidations(List<CastVoteRecord> castVoteRecords)
       if (!isRankingAllowed(maxRanking, cvr.getContestId())) {
         Logger.severe(
             "CVR \"%s\" has a ranking %d, but contest \"%s\" has max ranking %s!",
+            // TODO: Do we want this to use the getSuppliedId or the getId method?
             cvr.getId(), maxRanking, cvr.getContestId(), config.getMaxRankingsAllowedAsString());
         throw new CastVoteRecord.CvrParseException();
       }

src/main/java/network/brightspots/rcv/CastVoteRecord.java

@@ -128,8 +128,13 @@ boolean doesUseLastAllowedRanking() {
     return usesLastAllowedRanking;
   }
 
+  // This represents the canonical ID used for audit logs and RCTab CVR
   String getId() {
-    return suppliedId != null ? suppliedId : computedId;
+    return !isNullOrBlank(computedId) ? computedId : suppliedId;
+  }
+
+  String getSuppliedId() {
+    return suppliedId != null ? suppliedId : "";
   }
 
   // logs the outcome for this CVR for this round for auditing purposes
@@ -138,11 +143,7 @@ void logRoundOutcome(
 
     StringBuilder logStringBuilder = new StringBuilder();
     logStringBuilder.append("[Round] ").append(round).append(" [CVR] ");
-    if (!isNullOrBlank(computedId)) {
-      logStringBuilder.append(computedId);
-    } else {
-      logStringBuilder.append(suppliedId);
-    }
+    logStringBuilder.append(getId());
     if (outcomeType == VoteOutcomeType.IGNORED) {
       logStringBuilder.append(" [was ignored] ");
     } else if (outcomeType == VoteOutcomeType.EXHAUSTED) {

src/main/java/network/brightspots/rcv/DominionCvrReader.java

@@ -291,7 +291,7 @@ private int parseCvrFile(
       String computedId =
           Stream.of(tabulatorId, batchId, Integer.toString(recordId))
               .filter(s -> s != null && !s.isBlank())
-              .collect(Collectors.joining("|"));
+              .collect(Collectors.joining("-")); // using a dash since this is an Id
 
       // filter out records which are not current and replace them with adjudicated ones
       HashMap adjudicatedData = (HashMap) session.get("Original");

src/main/java/network/brightspots/rcv/OutputWriter.java

@@ -696,14 +696,15 @@ String writeRcTabCvrCsv(
       CSVFormat format = CSVFormat.DEFAULT.builder().setNullString("").build();
       csvPrinter = new CSVPrinter(writer, format);
       // print header:
-      // ContestId, TabulatorId, BatchId, RecordId, Precinct, Precinct Portion, rank 1 selection,
-      // rank 2 selection, ... rank maxRanks selection
+      // RCTab CVR Id, ContestId, TabulatorId, BatchId, RecordId, Precinct, Precinct Portion,
+      // rank 1 selection, rank 2 selection, ... rank maxRanks selection
       csvPrinter.print("Source Filepath");
       csvPrinter.print("CVR Provider");
       csvPrinter.print("Contest Id");
+      csvPrinter.print("RCTab CVR Id");
       csvPrinter.print("Tabulator Id");
       csvPrinter.print("Batch Id");
-      csvPrinter.print("Record Id");
+      csvPrinter.print("Vendor Id");
       csvPrinter.print("Precinct");
       csvPrinter.print("Precinct Portion");
 
@@ -740,9 +741,10 @@ String writeRcTabCvrCsv(
         csvPrinter.print(currentSourceData.source.getFilePath());
         csvPrinter.print(currentSourceData.source.getProvider());
         csvPrinter.print(castVoteRecord.getContestId());
+        csvPrinter.print(castVoteRecord.getId());
         csvPrinter.print(castVoteRecord.getTabulatorId());
         csvPrinter.print(castVoteRecord.getSlice(TabulateBySlice.BATCH));
-        csvPrinter.print(castVoteRecord.getId());
+        csvPrinter.print(castVoteRecord.getSuppliedId());
         csvPrinter.print(castVoteRecord.getSlice(ContestConfig.TabulateBySlice.PRECINCT));
         csvPrinter.print(castVoteRecord.getPrecinctPortion());
         printRankings(currentSourceData.source.getUndeclaredWriteInLabel(), maxRank,
@@ -875,6 +877,7 @@ private List<Map<String, Object>> generateCdfMapForCvrs(List<CastVoteRecord> cas
     for (CastVoteRecord cvr : castVoteRecords) {
       List<Map<String, Object>> cvrSnapshots = new LinkedList<>();
       cvrSnapshots.add(generateCvrSnapshotMap(cvr, null, null));
+      // TODO: Do we want this to use the getSuppliedId or the getId method?
       String sanitizedId = sanitizeStringForOutput(cvr.getId());
       // copy most recent round snapshot data to subsequent rounds
       // until more snapshot data is available
@@ -981,6 +984,7 @@ private Map<String, Object> generateCvrSnapshotMap(
             entry("@type", "CVR.CVRContest"));
 
     return Map.ofEntries(
+        // TODO: Do we want this to use the getSuppliedId or the getId method?
         entry("@id", generateCvrSnapshotId(sanitizeStringForOutput(cvr.getId()), round)),
         entry("CVRContest", new Map[] {contestMap}),
         entry("Type", round != null ? "interpreted" : "original"),