From 36c0be3ef30517a9e924885779bdb350a646744d Mon Sep 17 00:00:00 2001
From: Steve Maier <82616727+SteveMaier-IRT@users.noreply.github.com>
Date: Thu, 14 Sep 2023 17:50:03 -0400
Subject: [PATCH] Make sure the ballot raw data is also changed. (#467)

* Make sure the ballot raw data is also changed.
only export the non-spoiled ballots

* updated version number
---
 .../ElectionGuard.UI.Lib/Services/Database/BallotService.cs  | 4 +++-
 .../ElectionGuard.UI/ElectionGuard.UI.csproj                 | 2 +-
 .../ElectionGuard.UI/Platforms/Windows/Package.appxmanifest  | 2 +-
 .../ElectionGuard.UI/ViewModels/BallotUploadViewModel.cs     | 5 +++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/electionguard-ui/ElectionGuard.UI.Lib/Services/Database/BallotService.cs b/src/electionguard-ui/ElectionGuard.UI.Lib/Services/Database/BallotService.cs
index 6ee764762..ad42e5a4b 100644
--- a/src/electionguard-ui/ElectionGuard.UI.Lib/Services/Database/BallotService.cs
+++ b/src/electionguard-ui/ElectionGuard.UI.Lib/Services/Database/BallotService.cs
@@ -42,7 +42,9 @@ public async Task<List<BallotRecord>> GetByElectionIdAsync(string electionId)
     /// <param name="electionId">election id to search for</param>
     public async Task<IAsyncCursor<BallotRecord>> GetCursorByElectionIdAsync(string electionId)
     {
-        var filter = FilterBuilder.Eq(Constants.ElectionId, electionId);
+        var filter = FilterBuilder.And(
+            FilterBuilder.Eq(Constants.ElectionId, electionId),
+            FilterBuilder.Ne(Constants.BallotState, BallotBoxState.Spoiled));
         return await GetCursorByFilterAsync(filter);
     }
 
diff --git a/src/electionguard-ui/ElectionGuard.UI/ElectionGuard.UI.csproj b/src/electionguard-ui/ElectionGuard.UI/ElectionGuard.UI.csproj
index 2d32b8292..b92a93633 100644
--- a/src/electionguard-ui/ElectionGuard.UI/ElectionGuard.UI.csproj
+++ b/src/electionguard-ui/ElectionGuard.UI/ElectionGuard.UI.csproj
@@ -18,7 +18,7 @@
 		<ApplicationIdGuid>c0679a79-bc22-46ad-9c49-93de983e3fa2</ApplicationIdGuid>
 
 		<!-- Versions -->
-		<ApplicationDisplayVersion>1.91.15</ApplicationDisplayVersion>
+		<ApplicationDisplayVersion>1.91.16</ApplicationDisplayVersion>
 		<ApplicationVersion>14</ApplicationVersion>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.3</SupportedOSPlatformVersion>
diff --git a/src/electionguard-ui/ElectionGuard.UI/Platforms/Windows/Package.appxmanifest b/src/electionguard-ui/ElectionGuard.UI/Platforms/Windows/Package.appxmanifest
index e41aeb5aa..ee2c71843 100644
--- a/src/electionguard-ui/ElectionGuard.UI/Platforms/Windows/Package.appxmanifest
+++ b/src/electionguard-ui/ElectionGuard.UI/Platforms/Windows/Package.appxmanifest
@@ -4,7 +4,7 @@
   xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap rescap">
 
-  <Identity Name="ElectionGuard.Admin" Publisher="CN=Microsoft" Version="1.91.15.0" />
+  <Identity Name="ElectionGuard.Admin" Publisher="CN=Microsoft" Version="1.91.16.0" />
 
   <mp:PhoneIdentity PhoneProductId="F7E69798-9268-43DC-A51E-3A95FA4992AD" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
diff --git a/src/electionguard-ui/ElectionGuard.UI/ViewModels/BallotUploadViewModel.cs b/src/electionguard-ui/ElectionGuard.UI/ViewModels/BallotUploadViewModel.cs
index 2278da788..f8f6ccacc 100644
--- a/src/electionguard-ui/ElectionGuard.UI/ViewModels/BallotUploadViewModel.cs
+++ b/src/electionguard-ui/ElectionGuard.UI/ViewModels/BallotUploadViewModel.cs
@@ -168,8 +168,9 @@ private async Task Upload()
             try
             {
                 var filename = Path.GetFileName(currentBallot);
-                var ballotData = await ReadFileAsync(currentBallot, cancellationToken);
-                using var ballot = new CiphertextBallot(RemoveSpoiled(ballotData));
+                var ballotOriginalData = await ReadFileAsync(currentBallot, cancellationToken);
+                var ballotData = RemoveSpoiled(ballotOriginalData);
+                using var ballot = new CiphertextBallot(ballotData);
 
                 if (ballot.Timestamp < startDate)
                 {