feat(emission): ignore fuels with non-carbontaxed emission category i…

…n the carbon tax calculation
bcgov · May 11, 2020 · 5f07be7 · 5f07be7
1 parent 145859b
commit 5f07be7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/schema/deploy/views/ciip_carbon_tax_calculation.sql b/schema/deploy/views/ciip_carbon_tax_calculation.sql
@@ -33,6 +33,8 @@ begin;
         date_part('day', ct_details_start.rate_end_date - reporting_year.reporting_period_start) as start_rate_days,
         date_part('day', reporting_year.reporting_period_end - ct_details_end.rate_start_date) as end_rate_days
       from ggircs_portal.ciip_fuel as cf
+        inner join ggircs_portal.emission_category
+          on cf.emission_category_id not in (select id from ggircs_portal.emission_category where swrs_emission_category is null)
       join ggircs_portal.fuel as f
         on cf.fuel_id = f.id
       join ggircs_portal.application as a

diff --git a/schema/deploy/views/ciip_fuel.sql b/schema/deploy/views/ciip_fuel.sql
@@ -18,7 +18,8 @@ begin;
        x.version_number,
        (x.fuel_data ->> 'quantity')::numeric as quantity,
        (x.fuel_data ->> 'fuelRowId')::integer as fuel_id,
-       (x.fuel_data ->> 'fuelUnits')::varchar(1000) as fuel_units
+       (x.fuel_data ->> 'fuelUnits')::varchar(1000) as fuel_units,
+       (x.fuel_data ->> 'emissionCategoryRowId')::numeric as emission_category_id
     from x
  );