Merge pull request #2554 from bcgov/feat/prashanth-edit-addr-analyst-2515

Feat/prashanth edit addr analyst 2515

Author: AlexZorkin

backend/Dockerfile.openshift

@@ -45,4 +45,12 @@ RUN chmod +x /app/wait-for-it.sh /app/lcfs/prestart.sh /app/lcfs/start.sh
 # Set the APP_ENVIRONMENT variable to 'production'
 ENV APP_ENVIRONMENT=prod
 
-CMD ["/app/lcfs/start.sh"]
+# CMD ["/app/lcfs/start.sh"] replaced with the following to allow for config file to be sourced
+CMD ["/bin/sh", "-c", "\
+  for cfg in database redis objectstorage email rabbitmq; do \
+    if [ -f /vault/secrets/$cfg ]; then \
+      . /vault/secrets/$cfg; \
+    fi; \
+  done; \
+  /app/lcfs/start.sh\
+"]

backend/lcfs/db/seeders/dev/user_role_seeder.py

@@ -59,10 +59,6 @@ async def seed_user_roles(session):
         {"user_profile_id": 21, "role_id": 1},
         {"user_profile_id": 21, "role_id": 3},
         {"user_profile_id": 21, "role_id": 4},
-        {"user_profile_id": 22, "role_id": 1},
-        {"user_profile_id": 22, "role_id": 3},
-        {"user_profile_id": 23, "role_id": 1},
-        {"user_profile_id": 23, "role_id": 3},
     ]
 
     try:

backend/lcfs/web/api/calculator/repo.py

@@ -299,14 +299,7 @@ async def get_fuel_type_options(
             query = query.where(FuelCategory.fuel_category_id == fuel_category_id)
         if fuel_type_id:
             query = query.where(FuelType.fuel_type_id == fuel_type_id)
-            print("Generated SQL Query:")
-        from sqlalchemy.dialects import postgresql
 
-        print(
-            query.compile(
-                dialect=postgresql.dialect(), compile_kwargs={"literal_binds": True}
-            )
-        )
         fuel_type_results = (await self.db.execute(query)).all()
 
         return {

backend/lcfs/web/api/compliance_report/summary_repo.py

@@ -144,7 +144,10 @@ async def get_previous_summary(
             )
             .limit(1)
         )
-        return result.scalars().first().summary
+        previous_report = result.scalars().first()
+        if previous_report is not None:
+            return previous_report.summary
+        return None
 
     @repo_handler
     async def get_transferred_out_compliance_units(
@@ -213,13 +216,17 @@ def aggregate_quantities(
                 and record.fuel_type.fossil_derived == fossil_derived
             ):
                 fuel_category = self._format_category(record.fuel_category.category)
-                fuel_quantities[fuel_category] += record.quantity
+                fuel_quantities[fuel_category] = fuel_quantities.get(
+                    fuel_category, 0
+                ) + (record.quantity or 0)
             elif (
                 isinstance(record, OtherUses)
                 and record.fuel_type.fossil_derived == fossil_derived
             ):
                 fuel_category = self._format_category(record.fuel_category.category)
-                fuel_quantities[fuel_category] += record.quantity_supplied
+                fuel_quantities[fuel_category] = fuel_quantities.get(
+                    fuel_category, 0
+                ) + (record.quantity_supplied or 0)
 
         return dict(fuel_quantities)
 

frontend/cypress.config.js

@@ -9,7 +9,10 @@ const { Client } = pg
 
 export default defineConfig({
   e2e: {
+    supportFile: 'cypress/support/e2e.js',
+    testIsolation: false,
     specPattern: ['**/*.feature', '**/*.cy.js'],
+    excludeSpecPattern: ['**/*.skip.feature'],
     screenshotsFolder: 'cypress/screenshots',
     videosFolder: 'cypress/videos',
     // Global configurations