Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

change ballot package location on USB #4142

Merged
merged 5 commits into from
Oct 31, 2023
Merged

change ballot package location on USB #4142

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
badb7fe
update export logic
adghayes Oct 31, 2023
0e74647
update import logic
adghayes Oct 31, 2023
958f60e
remove previously added carveout, not necessary now that ballot packa…
adghayes Oct 31, 2023
0f64b46
remove unused constant
adghayes Oct 31, 2023
ec88964
update tests across apps
adghayes Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions apps/admin/backend/src/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import { createReadStream, createWriteStream, promises as fs } from 'fs';
import path, { join } from 'path';
import {
BALLOT_PACKAGE_FOLDER,
generateElectionBasedSubfolderName,
generateFilenameForBallotExportPackage,
groupMapToGroupList,
isIntegrationTest,
Expand Down Expand Up @@ -221,12 +222,12 @@ function buildApi({
const electionRecord = getCurrentElectionRecord(workspace);
assert(electionRecord);
const { electionDefinition, id: electionId } = electionRecord;
const { election, electionHash } = electionDefinition;
const systemSettings = store.getSystemSettings(electionId);

const tempDirectory = dirSync().name;
try {
const ballotPackageFileName = generateFilenameForBallotExportPackage(
electionDefinition,
new Date()
);
const tempDirectoryBallotPackageFilePath = join(
Expand Down Expand Up @@ -255,8 +256,12 @@ function buildApi({
ballotPackageZipStream.finish();
await ballotPackageZipPromise.promise;

const usbDriveBallotPackageDirectoryRelativePath = join(
generateElectionBasedSubfolderName(election, electionHash),
BALLOT_PACKAGE_FOLDER
);
const exportBallotPackageResult = await exporter.exportDataToUsbDrive(
BALLOT_PACKAGE_FOLDER,
usbDriveBallotPackageDirectoryRelativePath,
ballotPackageFileName,
createReadStream(tempDirectoryBallotPackageFilePath)
);
Expand All @@ -272,7 +277,7 @@ function buildApi({
filePath: tempDirectoryBallotPackageFilePath,
});
const exportSignatureFileResult = await exporter.exportDataToUsbDrive(
BALLOT_PACKAGE_FOLDER,
usbDriveBallotPackageDirectoryRelativePath,
signatureFile.fileName,
signatureFile.fileContents
);
Expand Down
Loading