Merge pull request #2478 from PhilanthropyDataCommons/2476-add-control-columns-to-bulk-upload

hminsky2002 · web-flow · commit e80cb9a1a8ca · 2026-07-06T03:00:56.000-04:00
Add control columns to bulk uploader
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Paginated list endpoints no longer slow down as you request later pages.
 
+### Added
+
+- Bulk upload CSVs may now include `control:`-prefixed columns (e.g. `control:pdc_changemaker_id`). Control columns carry meta-information that changes how a row is processed; they are exempt from application-form validation and are not stored as base fields.
+
+### Changed
+
+- `pdc_changemaker_id` is now expected as a `control:` column in a bulk-upload, rather than as a base field.
+
 ## 0.40.0 2026-06-26
 
 ### Added
diff --git a/src/tasks/__tests__/fixtures/processBulkUploadTask/controlColumnAtNonFinalPosition.csv b/src/tasks/__tests__/fixtures/processBulkUploadTask/controlColumnAtNonFinalPosition.csv
@@ -0,0 +1,2 @@
+proposal_submitter_email,control:pdc_changemaker_id,organization_name
+foo@example.com,1,A Deliberately Different Name
diff --git a/src/tasks/__tests__/fixtures/processBulkUploadTask/controlColumnEmptyValue.csv b/src/tasks/__tests__/fixtures/processBulkUploadTask/controlColumnEmptyValue.csv
@@ -0,0 +1,2 @@
+proposal_submitter_email,organization_name,organization_tax_id,control:pdc_changemaker_id
+foo@example.com,Foo LLC.,51-2144346,
diff --git a/src/tasks/__tests__/fixtures/processBulkUploadTask/controlColumnMultipleRows.csv b/src/tasks/__tests__/fixtures/processBulkUploadTask/controlColumnMultipleRows.csv
@@ -0,0 +1,3 @@
+control:pdc_changemaker_id,organization_name
+1,Alice Org
+2,Bob Org
diff --git a/src/tasks/__tests__/fixtures/processBulkUploadTask/controlColumnWhitespaceValue.csv b/src/tasks/__tests__/fixtures/processBulkUploadTask/controlColumnWhitespaceValue.csv
@@ -0,0 +1,2 @@
+proposal_submitter_email,organization_name,control:pdc_changemaker_id
+foo@example.com,Some Name," 1 "
diff --git a/src/tasks/__tests__/fixtures/processBulkUploadTask/csvTemplateWithChangemakerIdAndTaxId.csv b/src/tasks/__tests__/fixtures/processBulkUploadTask/csvTemplateWithChangemakerIdAndTaxId.csv
@@ -1,2 +1,2 @@
-proposal_submitter_email,organization_name,organization_tax_id,pdc_changemaker_id
+proposal_submitter_email,organization_name,organization_tax_id,control:pdc_changemaker_id
 foo@example.com,A Deliberately Different Name,99-9999999,1
diff --git a/src/tasks/__tests__/fixtures/processBulkUploadTask/csvTemplateWithInvalidChangemakerId.csv b/src/tasks/__tests__/fixtures/processBulkUploadTask/csvTemplateWithInvalidChangemakerId.csv
@@ -1,2 +1,2 @@
-proposal_submitter_email,organization_name,pdc_changemaker_id
+proposal_submitter_email,organization_name,control:pdc_changemaker_id
 foo@example.com,Some Name,notanumber
diff --git a/src/tasks/__tests__/fixtures/processBulkUploadTask/csvTemplateWithNonexistentChangemakerId.csv b/src/tasks/__tests__/fixtures/processBulkUploadTask/csvTemplateWithNonexistentChangemakerId.csv
@@ -1,2 +1,2 @@
-proposal_submitter_email,organization_name,pdc_changemaker_id
+proposal_submitter_email,organization_name,control:pdc_changemaker_id
 foo@example.com,Some Name,999999
diff --git a/src/tasks/__tests__/fixtures/processBulkUploadTask/duplicateControlColumn.csv b/src/tasks/__tests__/fixtures/processBulkUploadTask/duplicateControlColumn.csv
@@ -0,0 +1,2 @@
+proposal_submitter_email,organization_name,control:pdc_changemaker_id,control:pdc_changemaker_id
+foo@example.com,Foo LLC.,1,1
diff --git a/src/tasks/__tests__/fixtures/processBulkUploadTask/rowColumnCountMismatch.csv b/src/tasks/__tests__/fixtures/processBulkUploadTask/rowColumnCountMismatch.csv
@@ -0,0 +1,2 @@
+proposal_submitter_email,organization_name
+foo@example.com,Foo LLC.,extra
diff --git a/src/tasks/__tests__/fixtures/processBulkUploadTask/unknownControlKey.csv b/src/tasks/__tests__/fixtures/processBulkUploadTask/unknownControlKey.csv
@@ -0,0 +1,2 @@
+proposal_submitter_email,organization_name,control:typo
+foo@example.com,Foo LLC.,1
diff --git a/src/tasks/__tests__/fixtures/processBulkUploadTask/validCsvTemplateWithChangemakerId.csv b/src/tasks/__tests__/fixtures/processBulkUploadTask/validCsvTemplateWithChangemakerId.csv
@@ -1,2 +1,2 @@
-proposal_submitter_email,organization_name,pdc_changemaker_id
+proposal_submitter_email,organization_name,control:pdc_changemaker_id
 foo@example.com,A Deliberately Different Name,1
diff --git a/src/tasks/__tests__/processBulkUploadTask.int.test.ts b/src/tasks/__tests__/processBulkUploadTask.int.test.ts
diff --git a/src/tasks/__tests__/processBulkUploadTask.unit.test.ts b/src/tasks/__tests__/processBulkUploadTask.unit.test.ts
diff --git a/src/tasks/processBulkUploadTask.ts b/src/tasks/processBulkUploadTask.ts
diff --git a/src/test/asymettricMatchers.ts b/src/test/asymettricMatchers.ts

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+proposal_submitter_email,control:pdc_changemaker_id,organization_name`
	`2`	`+foo@example.com,1,A Deliberately Different Name`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+proposal_submitter_email,organization_name,organization_tax_id,control:pdc_changemaker_id`
	`2`	`+foo@example.com,Foo LLC.,51-2144346,`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+control:pdc_changemaker_id,organization_name`
	`2`	`+1,Alice Org`
	`3`	`+2,Bob Org`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+proposal_submitter_email,organization_name,control:pdc_changemaker_id`
	`2`	`+foo@example.com,Some Name," 1 "`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-proposal_submitter_email,organization_name,organization_tax_id,pdc_changemaker_id`
	`1`	`+proposal_submitter_email,organization_name,organization_tax_id,control:pdc_changemaker_id`
`2`	`2`	`foo@example.com,A Deliberately Different Name,99-9999999,1`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+proposal_submitter_email,organization_name,control:pdc_changemaker_id,control:pdc_changemaker_id`
	`2`	`+foo@example.com,Foo LLC.,1,1`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+proposal_submitter_email,organization_name`
	`2`	`+foo@example.com,Foo LLC.,extra`