chore: handle the new commit_form_change_internal args in commit_form_change

Author: mikevespi

schema/deploy/mutations/commit_form_change.sql

@@ -12,7 +12,12 @@ begin
     validation_errors = coalesce(form_change_patch.validation_errors, validation_errors)
   where id=row_id;
 
-  return (select cif_private.commit_form_change_internal((select row(form_change.*)::cif.form_change from cif.form_change where id = row_id)));
+  return (select cif_private.commit_form_change_internal(
+    (select row(form_change.*)::cif.form_change from cif.form_change where id = row_id),
+    (select id  from cif.project_revision
+      where project_id=(select project_id from cif.project_revision where id = form_change_patch.project_revision_id)
+      and change_status = 'pending' and id != form_change_patch.project_revision_id limit 1)
+  ));
 end;
   $$ language plpgsql volatile;
 

schema/deploy/mutations/commit_form_change@1.15.0.sql

@@ -0,0 +1,23 @@
+-- Deploy cif:mutations/commit_form_change to pg
+-- requires: tables/form_change
+
+begin;
+
+create or replace function cif.commit_form_change(row_id int, form_change_patch cif.form_change)
+    returns cif.form_change as $$
+begin
+
+  update cif.form_change set
+    new_form_data = coalesce(form_change_patch.new_form_data, new_form_data),
+    validation_errors = coalesce(form_change_patch.validation_errors, validation_errors)
+  where id=row_id;
+
+  return (select cif_private.commit_form_change_internal((select row(form_change.*)::cif.form_change from cif.form_change where id = row_id)));
+end;
+  $$ language plpgsql volatile;
+
+grant execute on function cif.commit_form_change to cif_internal, cif_external, cif_admin;
+
+comment on function cif.commit_form_change is 'Custom mutation to commit a form_change record via the API. Only used for records that are independent of a project such as the lists of contacts and operators.';
+
+commit;

schema/revert/mutations/commit_form_change.sql

@@ -1,7 +1,23 @@
--- Revert cif:mutations/commit_form_change from pg
+-- Deploy cif:mutations/commit_form_change to pg
+-- requires: tables/form_change
 
 begin;
 
-drop function cif.commit_form_change;
+create or replace function cif.commit_form_change(row_id int, form_change_patch cif.form_change)
+    returns cif.form_change as $$
+begin
+
+  update cif.form_change set
+    new_form_data = coalesce(form_change_patch.new_form_data, new_form_data),
+    validation_errors = coalesce(form_change_patch.validation_errors, validation_errors)
+  where id=row_id;
+
+  return (select cif_private.commit_form_change_internal((select row(form_change.*)::cif.form_change from cif.form_change where id = row_id)));
+end;
+  $$ language plpgsql volatile;
+
+grant execute on function cif.commit_form_change to cif_internal, cif_external, cif_admin;
+
+comment on function cif.commit_form_change is 'Custom mutation to commit a form_change record via the API. Only used for records that are independent of a project such as the lists of contacts and operators.';
 
 commit;

schema/revert/mutations/commit_form_change@1.15.0.sql

@@ -0,0 +1,7 @@
+-- Revert cif:mutations/commit_form_change from pg
+
+begin;
+
+drop function cif.commit_form_change;
+
+commit;

schema/sqitch.plan

@@ -368,3 +368,4 @@ functions/handle_milestone_form_change_commit [functions/handle_milestone_form_c
 functions/jsonb_minus 2023-10-30T19:55:55Z Mike Vesprini <mike@button.is> # Function to provide the object difference between two jsonb objects
 mutations/commit_form_change_internal [mutations/commit_form_change_internal@1.15.0] 2023-10-30T21:34:15Z Mike Vesprini <mike@button.is> # Handle rebasing when committing with another pending revision on the same project"
 mutations/commit_project_revision [mutations/commit_project_revision@1.15.0] 2023-10-31T00:07:01Z Mike Vesprini <mike@button.is> # Update function to pass new parameters to commit_form_change_internal
+mutations/commit_form_change [mutations/commit_form_change@1.15.0] 2023-11-22T19:00:00Z Mike Vesprini <mike@button.is> # Add pending project revision id to args of commit_form_change_internal call

schema/test/unit/mutations/commit_form_change_test.sql

@@ -7,7 +7,7 @@ select plan(2);
 /** SETUP **/
 truncate cif.form_change restart identity;
 
-create or replace function cif_private.commit_form_change_internal(fc cif.form_change)
+create or replace function cif_private.commit_form_change_internal(fc cif.form_change, pending_project_revision_id int default null)
 returns cif.form_change as $$
 begin
   return fc;
@@ -54,7 +54,7 @@ select results_eq(
       validation_errors
     from cif.commit_form_change(
       12345,
-      (select row( null, '{"updated":true}', null, null, null, null, null, null, null, '["hazErrors"]', null, null, null, null, null)::cif.form_change)
+       (select row( null, '{"updated":true}', null, null, null, null, null, null, null, '[]', null, null, null, null, null)::cif.form_change)
     );
   $$,
   $$
@@ -68,7 +68,7 @@ select results_eq(
       null::int,
       'pending'::varchar,
       'reporting_requirement'::varchar,
-      '["hazErrors"]'::jsonb
+      '[]'::jsonb
     )
   $$,
   'commit_form_change calls the private commit_form_change_internal() function'

schema/verify/mutations/commit_form_change@1.15.0.sql

@@ -0,0 +1,7 @@
+-- Verify cif:mutations/commit_form_change on pg
+
+begin;
+
+select pg_get_functiondef('cif.commit_form_change(int, cif.form_change)'::regprocedure);
+
+rollback;