fixed clean_fiscal_yr function

ge-tbs · ge-tbs · commit c1eb30f33368 · 2025-09-25T14:24:03.000Z
diff --git a/outputs/snapshots/2025-03-01/indicators/drr_all.csv b/outputs/snapshots/2025-03-01/indicators/drr_all.csv
@@ -6,4 +6,4 @@ fiscal_yr;hv_online_e2e_count;hv_service_count;dr2467_score;hvte_services_count_
 2022-2023;47;92;51.08695652173913;63;116;54.310344827586206;267912629.0;392081427.0;68.3308645986947
 2023-2024;48;90;53.333333333333336;61;117;52.13675213675214;254219380.0;393465336.0;64.61036252504846
 
-Timestamp:2025-09-23_09:18:44
+Timestamp:2025-09-25_10:14:15
diff --git a/outputs/snapshots/2025-03-01/indicators/maf_all.csv b/outputs/snapshots/2025-03-01/indicators/maf_all.csv
@@ -458,4 +458,4 @@ fiscal_yr;org_id;department_en;department_fr;service_with_std_count;service_coun
 2023-2024;246;Women and Gender Equality Canada;Femmes et Égalité des genres Canada;3;3;100.0;4.0;6.0;66.66666666666666;3;3;100.0;18.0;18.0;100.0;3;3;100.0
 2024-2025;295;Royal Canadian Mounted Police;Gendarmerie royale du Canada;0;1;0.0;;;;0;1;0.0;;;;0;1;0.0
 
-Timestamp:2025-09-23_09:18:44
+Timestamp:2025-09-25_10:14:15
diff --git a/outputs/snapshots/2025-03-01/indicators/service_fte_spending.csv b/outputs/snapshots/2025-03-01/indicators/service_fte_spending.csv
@@ -17263,4 +17263,4 @@ SRV03062;2023-2024;BWK01;139;2024-2025;2026-2027;planned;39.0;4948923.0;True
 2106;2023-2024;BXR02;246;2024-2025;2025-2026;planned;172.0;327113840.0;True
 2106;2023-2024;BXR02;246;2024-2025;2026-2027;planned;98.0;206220750.0;True
 
-Timestamp:2025-09-23_09:18:47
+Timestamp:2025-09-25_10:14:18
diff --git a/outputs/snapshots/2025-03-01/indicators/si_oip.csv b/outputs/snapshots/2025-03-01/indicators/si_oip.csv
@@ -53604,4 +53604,4 @@ fiscal_yr;org_id;service_id;fy_org_id_service_id;online_interaction_point;activa
 2023-2024;246;2105;2023-2024_246_2105;issue_resolution_feedback;Y;6
 2023-2024;246;2106;2023-2024_246_2106;issue_resolution_feedback;Y;6
 
-Timestamp:2025-09-23_09:18:43
+Timestamp:2025-09-25_10:14:15
diff --git a/outputs/snapshots/2025-03-01/indicators/si_reviews.csv b/outputs/snapshots/2025-03-01/indicators/si_reviews.csv
@@ -458,4 +458,4 @@ fiscal_yr;org_id;total_services;services_reviewed_in_past_5_yrs;services_improve
 2023-2024;99;5;2;2
 2024-2025;295;1;0;1
 
-Timestamp:2025-09-23_09:18:43
+Timestamp:2025-09-25_10:14:15
diff --git a/outputs/snapshots/2025-03-01/indicators/si_vol.csv b/outputs/snapshots/2025-03-01/indicators/si_vol.csv
@@ -7380,4 +7380,4 @@ fiscal_yr;org_id;service_id;channel;volume
 2023-2024;139;1279;other;19023.0
 2023-2024;139;SRV03062;other;1.0
 
-Timestamp:2025-09-23_09:18:43
+Timestamp:2025-09-25_10:14:15
diff --git a/outputs/snapshots/2025-03-01/indicators/ss_tml_perf_vol.csv b/outputs/snapshots/2025-03-01/indicators/ss_tml_perf_vol.csv
@@ -5848,4 +5848,4 @@ fiscal_yr;org_id;service_id;channel;volume_meeting_target;total_volume;volume_no
 2023-2024;99;208;ONL;28.0;35.0;7.0
 2023-2024;99;2114;ONL;1105.0;1124.0;19.0
 
-Timestamp:2025-09-23_09:18:43
+Timestamp:2025-09-25_10:14:15
diff --git a/outputs/snapshots/2025-03-01/si.csv b/outputs/snapshots/2025-03-01/si.csv
diff --git a/outputs/snapshots/2025-03-01/ss.csv b/outputs/snapshots/2025-03-01/ss.csv
@@ -16858,4 +16858,4 @@ Processing time for all VAC applications/requests is counted from the time we re
 2023-2024;246;2106;Equality for Sex, Sexual Orientation, Gender Identity and Expression Program;Programme de promotion de l'égalité des sexes, de l'orientation sexuelle, de l'identité et de l'expression de genre;3080;Issue payments within 20 business days of the successful fulfillment of requirements outlined in the funding agreement.;Notre objectif est d’émettre les paiements dans un délai de 20 jours ouvrables après que les exigences énoncées dans l’entente de financement ont été satisfaites.;TML;;ONL;NA;NA;;0.8;241.0;269.0;0.8959;NA;NA;Y;https://www.canada.ca/en/women-gender-equality/funding/funding-programs/service-standards.html;https://www.canada.ca/fr/femmes-egalite-genres/financement/programmes-financement/normes-service.html;Not applicable;Non applicable;wage;Women and Gender Equality Canada;Femmes et Égalité des genres Canada;2023-2024_246_2106;2023-2024_246_2106_3080
 2023-2024;246;2106;Equality for Sex, Sexual Orientation, Gender Identity and Expression Program;Programme de promotion de l'égalité des sexes, de l'orientation sexuelle, de l'identité et de l'expression de genre;3081;Acknowledge receipt of application forms within 2 business days.;Notre objectif est d’accuser réception du formulaire de demande dans un délai de 2 jours ouvrables.;TML;;ONL;NA;NA;;1.0;233.0;234.0;0.9957;Applications are now accepted through both calls for proposals where acknowledgements are automated and through continuous intake (not automated);Les demandes sont désormais acceptées à la fois par le biais d'appels de propositions, dont les accusés de réception sont automatisés, et par le biais d'un système d'entree continue (non automatisé).;N;https://www.canada.ca/en/women-gender-equality/funding/funding-programs/service-standards.html;https://www.canada.ca/fr/femmes-egalite-genres/financement/programmes-financement/normes-service.html;Not applicable;Non applicable;wage;Women and Gender Equality Canada;Femmes et Égalité des genres Canada;2023-2024_246_2106;2023-2024_246_2106_3081
 
-Timestamp:2025-09-23_09:18:42
+Timestamp:2025-09-25_10:14:14
diff --git a/outputs/snapshots/2025-03-01/utils/si_all.csv b/outputs/snapshots/2025-03-01/utils/si_all.csv
diff --git a/outputs/snapshots/2025-03-01/utils/ss_all.csv b/outputs/snapshots/2025-03-01/utils/ss_all.csv
@@ -16932,4 +16932,4 @@ Processing time for all VAC applications/requests is counted from the time we re
 2023-2024;2106;Equality for Sex, Sexual Orientation, Gender Identity and Expression Program;Programme de promotion de l'égalité des sexes, de l'orientation sexuelle, de l'identité et de l'expression de genre;3080;Issue payments within 20 business days of the successful fulfillment of requirements outlined in the funding agreement.;Notre objectif est d’émettre les paiements dans un délai de 20 jours ouvrables après que les exigences énoncées dans l’entente de financement ont été satisfaites.;TML;;ONL;NA;NA;;0.8;241.0;269.0;0.8959;NA;NA;Y;https://www.canada.ca/en/women-gender-equality/funding/funding-programs/service-standards.html;https://www.canada.ca/fr/femmes-egalite-genres/financement/programmes-financement/normes-service.html;Not applicable;Non applicable;wage;246;Women and Gender Equality Canada;Femmes et Égalité des genres Canada;2023-2024_246_2106;2023-2024_246_2106_3080
 2023-2024;2106;Equality for Sex, Sexual Orientation, Gender Identity and Expression Program;Programme de promotion de l'égalité des sexes, de l'orientation sexuelle, de l'identité et de l'expression de genre;3081;Acknowledge receipt of application forms within 2 business days.;Notre objectif est d’accuser réception du formulaire de demande dans un délai de 2 jours ouvrables.;TML;;ONL;NA;NA;;1.0;233.0;234.0;0.9957;Applications are now accepted through both calls for proposals where acknowledgements are automated and through continuous intake (not automated);Les demandes sont désormais acceptées à la fois par le biais d'appels de propositions, dont les accusés de réception sont automatisés, et par le biais d'un système d'entree continue (non automatisé).;N;https://www.canada.ca/en/women-gender-equality/funding/funding-programs/service-standards.html;https://www.canada.ca/fr/femmes-egalite-genres/financement/programmes-financement/normes-service.html;Not applicable;Non applicable;wage;246;Women and Gender Equality Canada;Femmes et Égalité des genres Canada;2023-2024_246_2106;2023-2024_246_2106_3081
 
-Timestamp:2025-09-23_09:18:42
+Timestamp:2025-09-25_10:14:13
diff --git a/src/clean.py b/src/clean.py
@@ -23,13 +23,23 @@ def clean_fiscal_yr(yr):
         for old, new in fy_cleanup.items():
             yr = yr.replace(old, new)
 
-        # Regex transformation for fiscal years (XXXX-YY → XXXX-YYYY)
-        yr = re.sub(
-            r"(\d{4})-\d{2}", 
-            lambda m: f"{m.group(1)}-{int(m.group(1)) + 1}",
-            yr
-        )
-
+        # Regex transformation for fiscal years (XXXX-YY → XXXX-(XXXX+1))
+        match = re.fullmatch(r'\d{4}-\d{2}', yr)
+        if match:
+            yr = re.sub(
+                r"(\d{4})-\d{2}",
+                lambda m: f"{m.group(1)}-{int(m.group(1)) + 1}",
+                yr
+            )
+
+        # Regex transformation for fiscal years (XX-YY → 20XX-20YY)
+        match = re.fullmatch(r'\d{2}-\d{2}', yr)
+        if match:
+            yr = re.sub(
+                r"(\d{2})-(\d{2})",
+                lambda m: f"20{m.group(1)}-20{m.group(2)}",
+                yr
+            )
         return yr
 
     except Exception as e:
