Merge pull request #1658 from bcgov/LCFS-1207-AddFuelCodeCIColumnsFue…

…lsOtherUse_v2 LCFS-1659: Incorrect fuel type list in Fuels for other use
bcgov · Jan 16, 2025 · 3ac4f0f · 3ac4f0f
2 parents e783917 + e73dba9
commit 3ac4f0f
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 1 deletion.
diff --git a/backend/lcfs/db/migrations/versions/2025-01-14-18-12_fe03799b4018.py b/backend/lcfs/db/migrations/versions/2025-01-14-18-12_fe03799b4018.py
@@ -0,0 +1,61 @@
+"""Update other_uses_fossil_derived in fuel_type
+
+Revision ID: fe03799b4018
+Revises: fa98709e7952
+Create Date: 2025-01-14 18:12:43.683691
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "fe03799b4018"
+down_revision = "5163af6ba4a4"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # Set other_uses_fossil_derived to false
+    op.execute("""
+        UPDATE fuel_type 
+        SET other_uses_fossil_derived = false
+        WHERE fuel_type IN (
+            'CNG', 'Electricity', 'Hydrogen', 'LNG', 'Propane', 
+            'Natural gas-based gasoline', 'Petroleum-based diesel', 
+            'Petroleum-based gasoline'
+        )
+    """)
+
+    # Set other_uses_fossil_derived to true
+    op.execute("""
+        UPDATE fuel_type 
+        SET other_uses_fossil_derived = true
+        WHERE fuel_type IN (
+            'Alternative jet fuel', 'Biodiesel', 'Ethanol', 'HDRD',
+            'Other diesel fuel', 'Renewable gasoline', 'Renewable naphtha'
+        )
+    """)
+
+def downgrade() -> None:
+    # Revert `other_uses_fossil_derived` to original values for false
+    op.execute("""
+        UPDATE fuel_type
+        SET other_uses_fossil_derived = true
+        WHERE fuel_type IN (
+            'CNG', 'Electricity', 'Hydrogen', 'LNG', 'Propane',
+            'Natural gas-based gasoline', 'Petroleum-based diesel',
+            'Petroleum-based gasoline'
+        )
+    """)
+
+    # Revert `other_uses_fossil_derived` to original values for true
+    op.execute("""
+        UPDATE fuel_type
+        SET other_uses_fossil_derived = false
+        WHERE fuel_type IN (
+            'Alternative jet fuel', 'Biodiesel', 'Ethanol', 'HDRD',
+            'Other diesel fuel', 'Renewable gasoline', 'Renewable naphtha'
+        )
+    """)
diff --git a/backend/lcfs/web/api/other_uses/repo.py b/backend/lcfs/web/api/other_uses/repo.py
@@ -350,6 +350,7 @@ async def get_formatted_fuel_types(
                 joinedload(FuelType.provision_1),
                 joinedload(FuelType.provision_2),
             )
+            .order_by(FuelType.fuel_type)
         )
 
         result = await self.db.execute(query)

diff --git a/frontend/src/views/OtherUses/AddEditOtherUses.jsx b/frontend/src/views/OtherUses/AddEditOtherUses.jsx
@@ -208,6 +208,15 @@ export const AddEditOtherUses = () => {
 
             params.node.setDataValue('fuelCategory', categoryValue)
 
+            // Auto populate the "provisionOfTheAct" field
+            const provisions = fuelType.provisionOfTheAct.map(
+              (provision) => provision.name
+            )
+
+            const provisionValue =
+            provisions.length === 1 ? provisions[0] : null
+            params.node.setDataValue('provisionOfTheAct', provisionValue)
+
             // Auto-populate the "fuelCode" field
             const fuelCodeOptions = fuelType.fuelCodes.map(
               (code) => code.fuelCode

diff --git a/frontend/src/views/OtherUses/OtherUsesSummary.jsx b/frontend/src/views/OtherUses/OtherUsesSummary.jsx
@@ -89,7 +89,7 @@ export const OtherUsesSummary = ({ data, status }) => {
       minWidth: 200
     },
     {
-      headerName: t('otherUses:otherUsesColLabels.rationale'),
+      headerName: t('otherUses:otherUsesColLabels.otherExpectedUse'),
       field: 'rationale',
       floatingFilter: false,
       flex: 1,