Merge branch 'main' into task/Export-encription-backend

.gitignore

@@ -159,6 +159,7 @@ bindings/netstandard/ElectionGuard/*.user
 lint-results.xml
 
 database/
+!src/electionguard-ui/ElectionGuard.UI.Lib/Services/Database
 
 node_modules/
 

src/electionguard-db/mongo-init.js

@@ -1,3 +1,22 @@
 db.createCollection("key_ceremonies");
-db.key_ceremonies.createIndex({ completed_at: 1 });
-db.key_ceremonies.createIndex({ key_ceremony_name: 1 });
+db.createCollection("elections");
+db.createCollection("ballots");
+db.createCollection("tallies");
+
+db.key_ceremonies.createIndex({ KeyCeremonyId: 1, DataType: 1 });
+db.key_ceremonies.createIndex({ KeyCeremonyId: 1, DesignatedId: 1, DataType: 1 });
+db.key_ceremonies.createIndex({ KeyCeremonyId: 1, GuardianId: 1, DataType: 1 });
+db.key_ceremonies.createIndex({ State: 1, DataType: 1 });
+
+db.elections.createIndex({ ElectionId: 1, DataType: 1 });
+db.elections.createIndex({ Name: 1, DataType: 1 });
+
+db.ballots.createIndex({ ElectionId: 1, DataType: 1 });
+db.ballots.createIndex({ UploadId: 1, DataType: 1 });
+db.ballots.createIndex({ BallotCode: 1, DataType: 1 });
+db.ballots.createIndex({ SerialNumber: 1, ElectionId: 1, DataType: 1 });
+
+db.tallies.createIndex({ Name: 1, DataType: 1 });
+db.tallies.createIndex({ ElectionId: 1, DataType: 1 });
+db.tallies.createIndex({ TallyId: 1, DataType: 1 });
+db.tallies.createIndex({ State: 1, DataType: 1 });

src/electionguard-ui/ElectionGuard.UI.Lib/Services/Database/BallotService.cs

@@ -50,16 +50,12 @@ public async Task<bool> BallotExists(string ballotCode)
     }
 
     /// <summary>
-    /// Check to see if the ballot has already been included
+    /// Get a ballot based on its ballot code
     /// </summary>
     /// <param name="ballotCode">ballotcode to find</param>
-    public async Task<bool> GetByBallotCodeAsync(string ballotCode)
+    public async Task<BallotRecord?> GetByBallotCodeAsync(string ballotCode)
     {
-        var filterBuilder = Builders<BallotRecord>.Filter;
-        var filter = filterBuilder.And(filterBuilder.Eq(Constants.BallotCode, ballotCode));
-
-        var ballotCount = await CountByFilterAsync(filter);
-        return ballotCount > 0;
+        return await GetByFieldAsync(Constants.BallotCode, ballotCode);
     }
 
     /// <summary>
@@ -73,5 +69,4 @@ public async Task DeleteByBallotCodeAsync(string ballotCode)
 
         await MarkAsDeletedAsync(filter);
     }
-
 }

src/electionguard-ui/ElectionGuard.UI.Lib/Services/Database/BallotUploadService.cs

@@ -35,5 +35,4 @@ public async Task<bool> DriveUsed(long serialNumber, string electionId)
         var uploadCount = await CountByFilterAsync(filter);
         return uploadCount > 0;
     }
-
 }

src/electionguard-ui/ElectionGuard.UI.Lib/Services/Database/CiphertextTallyService.cs

@@ -1,5 +1,4 @@
 using ElectionGuard.UI.Lib.Models;
-using MongoDB.Driver;
 
 namespace ElectionGuard.UI.Lib.Services;
 
@@ -26,5 +25,4 @@ public class CiphertextTallyService : BaseDatabaseService<CiphertextTallyRecord>
     {
         return await GetByFieldAsync(Constants.TallyId, tallyId);
     }
-
 }

src/electionguard-ui/ElectionGuard.UI.Lib/Services/Database/ConstantsService.cs

@@ -25,5 +25,4 @@ public class ConstantsService : BaseDatabaseService<ConstantsRecord>
     {
         return await GetByFieldAsync(Constants.ElectionId, electionId);
     }
-
 }

src/electionguard-ui/ElectionGuard.UI.Lib/Services/Database/ContextService.cs

@@ -25,5 +25,4 @@ public class ContextService : BaseDatabaseService<ContextRecord>
     {
         return await GetByFieldAsync(Constants.ElectionId, electionId);
     }
-
 }

src/electionguard-ui/ElectionGuard.UI.Lib/Services/Database/DbService.cs

@@ -147,10 +147,9 @@ public static bool Ping()
         }
 
         var server = client.Cluster.Description.Servers.FirstOrDefault();
-        return (
+        return
             server is not null &&
             server.HeartbeatException is null &&
-            server.State == ServerState.Connected
-            );
+            server.State == ServerState.Connected;
     }
 }

src/electionguard-ui/ElectionGuard.UI.Lib/Services/Database/GuardianBackupService.cs

@@ -66,5 +66,4 @@ public async Task<long> CountAsync(string keyCeremonyId, string guardianId)
 
         return await CountByFilterAsync(filter);
     }
-
 }

src/electionguard-ui/ElectionGuard.UI.Lib/Services/Database/GuardianPublicKeyService.cs

@@ -71,6 +71,4 @@ public async Task<long> CountAsync(string keyCeremonyId)
         var list = await GetAllByFilterAsync(filter);
         return list.FirstOrDefault();
     }
-
-
 }

src/electionguard-ui/ElectionGuard.UI.Lib/Services/Database/LagrangeCoefficientsService.cs

@@ -1,5 +1,4 @@
 using ElectionGuard.UI.Lib.Models;
-using MongoDB.Driver;
 
 namespace ElectionGuard.UI.Lib.Services;
 

src/electionguard-ui/ElectionGuard.UI.Lib/Services/Database/PlaintextSpoiledBallotService.cs

@@ -1,5 +1,4 @@
 using ElectionGuard.UI.Lib.Models;
-using MongoDB.Driver;
 
 namespace ElectionGuard.UI.Lib.Services;
 

src/electionguard-ui/ElectionGuard.UI.Lib/Services/Database/PlaintextTallyService.cs

@@ -1,5 +1,4 @@
 using ElectionGuard.UI.Lib.Models;
-using MongoDB.Driver;
 
 namespace ElectionGuard.UI.Lib.Services;
 

src/electionguard-ui/ElectionGuard.UI.Lib/Services/Database/TallyService.cs

@@ -58,6 +58,4 @@ virtual public async Task UpdateCompleteAsync(string tallyId)
 
         await UpdateAsync(filter, update);
     }
-
-
 }

src/electionguard-ui/ElectionGuard.UI.Lib/Services/Database/VerificationService.cs

@@ -49,6 +49,4 @@ public async Task<long> CountAsync(string keyCeremonyId)
 
         return await CountByFilterAsync(filter);
     }
-
-
 }