updates to dp_metrics indicator file

Author: ge-tbs

main.py

@@ -127,10 +127,6 @@ def setup_logging():
     h_console.setLevel(logging.INFO)
     h_console.setFormatter(f_simple)
 
-    # Source - https://stackoverflow.com/a/55248611
-    # Posted by lotrgollum87, modified by community. See post 'Timeline' for change history
-    # Retrieved 2026-02-10, License - CC BY-SA 4.0
-
     # Create debug log file
     debug_log_filename = "outputs/debug.log"
     os.makedirs(os.path.dirname(debug_log_filename), exist_ok=True)

src/process.py

@@ -788,24 +788,26 @@ def is_filled(col):
                 'num_applications_online':'sum', 
                 'num_applications_in_person':'sum',
                 'num_phone_apps_enquiries':'sum',
-                'num_applications_by_mail':'sum'
-            }).reset_index().rename(columns={'fy_org_id_service_id':'total_services', 'org_id': 'total_orgs_ext'}),
+                'num_applications_by_mail':'sum',
+                'num_applications_total':'sum'
+            }).rename(columns={'fy_org_id_service_id':'total_services', 'org_id': 'total_orgs'}).add_suffix('_ext').reset_index(),
             on='fiscal_yr',
-            how='left',
-            suffixes=('', '_ext')
+            how='left'
         )
 
         dp_filtered = si_dp[si_dp['external'] & ~si_dp['service_id'].isin(EXCLUDED_SERVICES_ID)]
         dp_metrics = dp_metrics.merge(
             dp_filtered.groupby('fiscal_yr').agg({
                 'num_applications_online':'sum', # remove 1677
                 'num_applications_in_person':'sum', # remove 669
-            }).reset_index(),
+                'num_applications_total':'sum' # removed both
+            }).add_suffix('_ext_excl_services').reset_index(),
             on='fiscal_yr',
-            how='left',
-            suffixes=('', '_ext_excl_services')
+            how='left'
         )
 
+
+
         # === DATA PACK METRIC 7 ===
         # 7: External programs
         dp_filtered = si_dp[si_dp['external']].loc[:, ['service_id', 'fiscal_yr', 'program_id', 'org_id']].copy()