Use json queries for proposal field values

Issue #821 Change our query approach to use DB-level json functions
PhilanthropyDataCommons · May 10, 2024 · 366a176 · 366a176
1 parent 87c7991
commit 366a176
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/src/database/operations/create/createProposalFieldValue.ts b/src/database/operations/create/createProposalFieldValue.ts
@@ -2,6 +2,7 @@ import { db as defaultDb } from '../../db';
 import type {
 	ProposalFieldValue,
 	InternallyWritableProposalFieldValue,
+	JsonResultSet,
 } from '../../../types';
 
 const createProposalFieldValue = async (
@@ -15,7 +16,7 @@ const createProposalFieldValue = async (
 		value,
 		isValid,
 	} = createValues;
-	const result = await db.sql<ProposalFieldValue>(
+	const result = await db.sql<JsonResultSet<ProposalFieldValue>>(
 		'proposalFieldValues.insertOne',
 		{
 			proposalVersionId,
@@ -25,7 +26,7 @@ const createProposalFieldValue = async (
 			isValid,
 		},
 	);
-	const object = result.rows[0];
+	const { object } = result.rows[0] ?? {};
 	if (object === undefined) {
 		throw new Error(
 			'The entity creation did not appear to fail, but no data was returned by the operation.',

diff --git a/src/database/queries/proposalFieldValues/insertOne.sql b/src/database/queries/proposalFieldValues/insertOne.sql
@@ -11,11 +11,4 @@ INSERT INTO proposal_field_values (
   :position,
   :isValid
 )
-RETURNING
-  id as "id",
-  proposal_version_id as "proposalVersionId",
-  application_form_field_id as "applicationFormFieldId",
-  value as "value",
-  position as "position",
-  is_valid as "isValid",
-  created_at AS "createdAt"
+RETURNING proposal_field_value_to_json(proposal_field_values) AS "object";