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.

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

remove batchLabel #4246

Merged
merged 1 commit into from
Nov 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions apps/central-scan/backend/src/store.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,6 @@ test('iterating over sheets', () => {
type: 'accepted',
id: sheet1Id,
batchId,
batchLabel: 'Batch 1',
interpretation: mapSheet(sheetWithFiles, (page) => page.interpretation),
frontImagePath: '1-front.jpg',
backImagePath: '1-back.jpg',
Expand Down Expand Up @@ -598,7 +597,6 @@ test('iterating over sheets', () => {
type: 'accepted',
id: sheet3Id,
batchId,
batchLabel: 'Batch 1',
interpretation: [
interpretationRequiringAdjudication,
sheetWithFiles[1].interpretation,
Expand Down
3 changes: 0 additions & 3 deletions apps/central-scan/backend/src/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ const getSheetsBaseQuery = `
select
sheets.id as id,
batches.id as batchId,
batches.label as batchLabel,
front_interpretation_json as frontInterpretationJson,
back_interpretation_json as backInterpretationJson,
front_image_path as frontImagePath,
Expand All @@ -67,7 +66,6 @@ const getSheetsBaseQuery = `
interface SheetRow {
id: string;
batchId: string;
batchLabel: string | null;
frontInterpretationJson: string;
backInterpretationJson: string;
frontImagePath: string;
Expand All @@ -84,7 +82,6 @@ function sheetRowToAcceptedSheet(row: SheetRow): AcceptedSheet {
type: 'accepted',
id: row.id,
batchId: row.batchId,
batchLabel: row.batchLabel ?? undefined,
interpretation: mapSheet(
[row.frontInterpretationJson, row.backInterpretationJson],
(json) => safeParseJson(json, PageInterpretationSchema).unsafeUnwrap()
Expand Down
3 changes: 0 additions & 3 deletions apps/scan/backend/src/store.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,6 @@ test('iterating over sheets', () => {
type: 'accepted',
id: sheet1Id,
batchId,
batchLabel: 'Batch 1',
interpretation: mapSheet(testSheetWithFiles, (page) => page.interpretation),
frontImagePath: '1-front.jpg',
backImagePath: '1-back.jpg',
Expand Down Expand Up @@ -568,7 +567,6 @@ test('iterating over sheets', () => {
type: 'accepted',
id: sheet3Id,
batchId,
batchLabel: 'Batch 1',
interpretation: [
interpretationRequiringAdjudication,
testSheetWithFiles[1].interpretation,
Expand Down Expand Up @@ -599,7 +597,6 @@ test('getSheet', () => {
type: 'accepted',
id: sheetId,
batchId,
batchLabel: 'Batch 1',
interpretation: mapSheet(testSheetWithFiles, (page) => page.interpretation),
frontImagePath: '/front.png',
backImagePath: '/back.png',
Expand Down
3 changes: 0 additions & 3 deletions apps/scan/backend/src/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ const getSheetsBaseQuery = `
select
sheets.id as id,
batches.id as batchId,
batches.label as batchLabel,
front_interpretation_json as frontInterpretationJson,
back_interpretation_json as backInterpretationJson,
front_image_path as frontImagePath,
Expand All @@ -78,7 +77,6 @@ const getSheetsBaseQuery = `
interface SheetRow {
id: string;
batchId: string;
batchLabel: string | null;
frontInterpretationJson: string;
backInterpretationJson: string;
frontImagePath: string;
Expand All @@ -94,7 +92,6 @@ function sheetRowToAcceptedSheet(row: SheetRow): AcceptedSheet {
type: 'accepted',
id: row.id,
batchId: row.batchId,
batchLabel: row.batchLabel ?? undefined,
interpretation: mapSheet(
[row.frontInterpretationJson, row.backInterpretationJson],
(json) => safeParseJson(json, PageInterpretationSchema).unsafeUnwrap()
Expand Down
5 changes: 0 additions & 5 deletions libs/backend/src/cast_vote_records/export.ts
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,6 @@ export interface AcceptedSheet {
* this would compromise voter privacy.
*/
readonly indexInBatch?: number;

/**
* TODO: Determine whether this field is still used and, if not, remove
*/
readonly batchLabel?: string;
}

/**
Expand Down