chore: using sqitch rework

bcgov · Sep 12, 2023 · f9275dd · f9275dd
1 parent 0994594
commit f9275dd
Show file tree

Hide file tree

Showing 12 changed files with 119 additions and 83 deletions.
diff --git a/schema/deploy/computed_columns/form_change_holdback_amount_to_date.sql b/schema/deploy/computed_columns/form_change_holdback_amount_to_date.sql
@@ -7,15 +7,26 @@ create or replace function cif.form_change_holdback_amount_to_date(parameter_fc
 returns numeric as
 $fn$
 
-  select
-    round(sum(coalesce((fc.new_form_data->>'adjustedHoldbackAmount')::numeric, (fc.new_form_data->>'calculatedHoldbackAmount')::numeric, 0)), 2)
+  with results as (
+    select
+        (fc.new_form_data->>'adjustedHoldbackAmount')::numeric as adjustedHoldbackAmount,
+        (fc.new_form_data->>'calculatedHoldbackAmount')::numeric as calculatedHoldbackAmount
     from cif.form_change fc
     where fc.project_revision_id = $1.project_revision_id
     and json_schema_name = 'milestone'
-    and (fc.new_form_data->>'hasExpenses')::boolean = true;
+    and (fc.new_form_data->>'hasExpenses')::boolean = true
+    and fc.operation <> 'archive'
+  )
+
+  select
+    case
+      when count(*) filter (where adjustedHoldbackAmount is null and calculatedHoldbackAmount is null) > 0 then null
+      else round(sum(coalesce(adjustedHoldbackAmount, calculatedHoldbackAmount)), 0)
+    end
+  from results;
 
 $fn$ language sql stable;
 
-comment on function cif.form_change_holdback_amount_to_date(cif.form_change) is 'Computed column returns sum all holdback amounts for a project. Preference for value selection is adjustedHoldbackAmount > calculuatedHoldbackAmount > amount calculated via maximum milestone amount';
+comment on function cif.form_change_holdback_amount_to_date(cif.form_change) is 'Computed column returns sum all holdback amounts for a project. If any of the milestones have null values for adjustedHoldbackAmount and calculatedHoldbackAmount, then null is returned. Preference for value selection is adjustedHoldbackAmount > calculatedHoldbackAmount > amount calculated via maximum milestone amount';
 
 commit;
diff --git a/...rm_change_holdback_amount_to_date_001.sql → [email protected] b/...rm_change_holdback_amount_to_date_001.sql → [email protected]
@@ -1,4 +1,5 @@
--- Revert cif:computed_columns/form_change_holdback_amount_to_date_001 from pg
+-- Deploy cif:computed_columns/form_change_holdback_amount_to_date to pg
+-- requires: tables/form_change
 
 begin;
 

diff --git a/schema/deploy/computed_columns/form_change_total_project_value.sql b/schema/deploy/computed_columns/form_change_total_project_value.sql
@@ -1,12 +1,8 @@
 -- Deploy cif:computed_columns/form_change_total_project_value to pg
-
-begin;
-
 create or replace function cif.form_change_total_project_value(cif.form_change)
 returns numeric
 as
 $computed_column$
-
 with additional_funding_sources as
     (
         select * from jsonb_to_recordset(
@@ -17,25 +13,37 @@ with additional_funding_sources as
         and operation != 'archive'
         )::jsonb
       ) as x(source text, amount numeric, status text)
-    )
-  select
+    ),
+additional_funding_sources_sum as
+    (
+        select sum(amount::numeric) as total from additional_funding_sources where status = 'Approved'
+    ),
+additional_funding_sources_exist as
     (
-      (select coalesce(($1.new_form_data ->> 'proponentCost')::numeric, 0) + coalesce(($1.new_form_data ->> 'maxFundingAmount')::numeric, 0))
-      +
-      coalesce((select sum(amount::numeric)
-        from additional_funding_sources
-        where status = 'Approved'
-          ), 0)
-    );
+        select 1 from cif.form_change fc
+        where fc.project_revision_id = $1.project_revision_id
+        and fc.form_data_table_name = 'funding_parameter'
+        and operation != 'archive'
+        and new_form_data->'additionalFundingSources' is not null
+    )
+select
+  case
+    when
+      (
+        ($1.new_form_data ->> 'proponentCost')::numeric IS NULL
+        OR
+        ($1.new_form_data ->> 'maxFundingAmount')::numeric IS NULL
+        OR
+        ((select * from additional_funding_sources_exist) is not null
+        AND (select total from additional_funding_sources_sum) IS NULL)
+      ) THEN NULL
+    else
+      (
+        coalesce(($1.new_form_data ->> 'proponentCost')::numeric, 0)
+        +
+        coalesce(($1.new_form_data ->> 'maxFundingAmount')::numeric, 0)
+        +
+        coalesce((select total from additional_funding_sources_sum), 0)
+      )
+  end;
 $computed_column$ language sql stable;
-
-grant execute on function cif.form_change_total_project_value to cif_internal, cif_external, cif_admin;
-
-comment on function cif.form_change_total_project_value is
-$$
-    Computed column to return the total project value.
-    Calculation:
-    - Total Project Value = Maximum Funding Amount + Proponent Cost + approved Additional Funding Amount(s)
-$$;
-
-commit;
diff --git a/...s/form_change_total_project_value_001.sql → [email protected] b/...s/form_change_total_project_value_001.sql → [email protected]
diff --git a/schema/deploy/computed_columns/form_change_total_project_value_001.sql b/schema/deploy/computed_columns/form_change_total_project_value_001.sql
diff --git a/schema/revert/computed_columns/form_change_holdback_amount_to_date.sql b/schema/revert/computed_columns/form_change_holdback_amount_to_date.sql
@@ -1,7 +1,21 @@
--- Revert cif:computed_columns/form_change_holdback_amount_to_date from pg
+-- Deploy cif:computed_columns/form_change_holdback_amount_to_date to pg
+-- requires: tables/form_change
 
 begin;
 
-drop function cif.form_change_holdback_amount_to_date(cif.form_change);
+create or replace function cif.form_change_holdback_amount_to_date(parameter_fc cif.form_change)
+returns numeric as
+$fn$
+
+  select
+    round(sum(coalesce((fc.new_form_data->>'adjustedHoldbackAmount')::numeric, (fc.new_form_data->>'calculatedHoldbackAmount')::numeric, 0)), 2)
+    from cif.form_change fc
+    where fc.project_revision_id = $1.project_revision_id
+    and json_schema_name = 'milestone'
+    and (fc.new_form_data->>'hasExpenses')::boolean = true;
+
+$fn$ language sql stable;
+
+comment on function cif.form_change_holdback_amount_to_date(cif.form_change) is 'Computed column returns sum all holdback amounts for a project. Preference for value selection is adjustedHoldbackAmount > calculuatedHoldbackAmount > amount calculated via maximum milestone amount';
 
 commit;
diff --git a/schema/revert/computed_columns/[email protected] b/schema/revert/computed_columns/[email protected]
@@ -0,0 +1,7 @@
+-- Revert cif:computed_columns/form_change_holdback_amount_to_date from pg
+
+begin;
+
+drop function cif.form_change_holdback_amount_to_date(cif.form_change);
+
+commit;
diff --git a/schema/revert/computed_columns/form_change_total_project_value.sql b/schema/revert/computed_columns/form_change_total_project_value.sql
@@ -1,7 +1,41 @@
--- Revert cif:computed_columns/form_change_total_project_value from pg
+-- Deploy cif:computed_columns/form_change_total_project_value to pg
 
 begin;
 
-drop function cif.form_change_total_project_value;
+create or replace function cif.form_change_total_project_value(cif.form_change)
+returns numeric
+as
+$computed_column$
+
+with additional_funding_sources as
+    (
+        select * from jsonb_to_recordset(
+        (select (new_form_data ->> 'additionalFundingSources')
+        from cif.form_change fc
+        where fc.project_revision_id = $1.project_revision_id
+        and fc.form_data_table_name = 'funding_parameter'
+        and operation != 'archive'
+        )::jsonb
+      ) as x(source text, amount numeric, status text)
+    )
+  select
+    (
+      (select coalesce(($1.new_form_data ->> 'proponentCost')::numeric, 0) + coalesce(($1.new_form_data ->> 'maxFundingAmount')::numeric, 0))
+      +
+      coalesce((select sum(amount::numeric)
+        from additional_funding_sources
+        where status = 'Approved'
+          ), 0)
+    );
+$computed_column$ language sql stable;
+
+grant execute on function cif.form_change_total_project_value to cif_internal, cif_external, cif_admin;
+
+comment on function cif.form_change_total_project_value is
+$$
+    Computed column to return the total project value.
+    Calculation:
+    - Total Project Value = Maximum Funding Amount + Proponent Cost + approved Additional Funding Amount(s)
+$$;
 
 commit;
diff --git a/schema/revert/computed_columns/[email protected] b/schema/revert/computed_columns/[email protected]
@@ -0,0 +1,7 @@
+-- Revert cif:computed_columns/form_change_total_project_value from pg
+
+begin;
+
+drop function cif.form_change_total_project_value;
+
+commit;
diff --git a/schema/sqitch.plan b/schema/sqitch.plan
@@ -359,3 +359,5 @@ tables/attachment_002_delete_permission 2023-07-31T18:06:38Z Brianna Cerkiewicz
 mutations/discard_project_attachment_form_change [mutations/[email protected]] 2023-07-31T18:05:23Z Brianna Cerkiewicz <briannacerkiewicz@pop-os> # Remove loop from discard mutation
 computed_columns/form_change_total_project_value_001 2023-07-21T00:06:15Z Gurjeet Matharu <[email protected]> # Modified cif.form_change_total_project_value function to return null if any input values are missing
 computed_columns/form_change_holdback_amount_to_date_001 2023-07-24T20:08:21Z Gurjeet Matharu <[email protected]># Modified cif.form_change_holdback_amount_to_date function to return null if any input values are missing for any milestone
+computed_columns/form_change_holdback_amount_to_date [computed_columns/[email protected]] 2023-07-27T22:18:03Z Gurjeet Matharu <[email protected]># Modified cif.form_change_holdback_amount_to_date function to return null if any input values are missing for any milestone
+computed_columns/form_change_total_project_value [computed_columns/[email protected]] 2023-07-27T22:19:30Z Gurjeet Matharu <[email protected]> # Modified cif.form_change_total_project_value function to return null if any input values are missing
diff --git a/...rm_change_holdback_amount_to_date_001.sql → [email protected] b/...rm_change_holdback_amount_to_date_001.sql → [email protected]
@@ -1,4 +1,4 @@
--- Verify cif:computed_columns/form_change_holdback_amount_to_date_001 on pg
+-- Verify cif:computed_columns/form_change_holdback_amount_to_date on pg
 
 begin;
 

diff --git a/...s/form_change_total_project_value_001.sql → [email protected] b/...s/form_change_total_project_value_001.sql → [email protected]
@@ -1,4 +1,4 @@
--- Verify cif:computed_columns/form_change_total_project_value_001 on pg
+-- Verify cif:computed_columns/form_change_total_project_value on pg
 
 begin;