patchwork_csv_utils 0.1.24-arm64-darwin → 0.1.25-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1db2ffec89b45266d5a8ad2a8d618bb3de42d595c3b32952faebb18a27f5de23
-  data.tar.gz: e61f36759936c903adac6c19f87eb2f83f63b3ace7def81449d45012f9e5f153
+  metadata.gz: 73651fcf0c950deeb381336f8ebe5677fc584bbbebe796992835afa689272b69
+  data.tar.gz: 6c4056a66f3154ed839aa3e8c864e49368bec0d970b9b2597757f3e38ce94ea6
 SHA512:
-  metadata.gz: dc525ae6d49821cd36b4f8ac9178e8fc386e5b11666754987092d4792d53d23d80785a3c5a9a8562c7b578a3368ef54d9c65bfc2fa30662da06ad1dcbd8862b3
-  data.tar.gz: 8ee34afcaef41819b994d98d5389f9e63fd47254f8db4b320dfcfd8d827ef28954ff46d68b6edd827f3dd971777cabf263956e48464f745d9ec7d4de8118ebf0
+  metadata.gz: bb66ac70a22fd5dd4168ad1ee23d67faf8c50f23ac65a683cc315dfa0b69d9d8b0bf89af543c302bb190a2ed6b68dcf9d262f34aba77a2f9901caed5afc0230f
+  data.tar.gz: 150b602ad74dd3334b3a7dc699b39234255c09a874be3a4f3eadeee385a6cad36a092ba36a584bf79c0e1382c74ef23ad27e1a7351def1c3004da9ab09fccbba

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    patchwork_csv_utils (0.1.24)
+    patchwork_csv_utils (0.1.25)
 
 GEM
   remote: https://rubygems.org/

data/ext/csv_utils/src/utils/shared/filters.rs

@@ -16,6 +16,17 @@ pub struct RowFilters {
     earliest_start_date: Option<NaiveDateTime>,
 }
 
+// Mirror Patchwork-on-Rails' Allocate::ExternalShiftInput#pad_request_id
+// (gsub(/[^0-9a-zA-Z]/, '') then rjust(10, '0')). The exclusion set is built
+// from Patchwork's cleaned external_ids, but Request Ids in BankStaff/Optima
+// sheets can carry a leading apostrophe (CSV text marker) or drop a leading
+// zero (Excel numeric cell). Normalising both sides identically keeps the
+// exclusion match aligned with how Rails stored the id.
+fn normalise_request_id(id: &str) -> String {
+    let cleaned: String = id.chars().filter(|c| c.is_ascii_alphanumeric()).collect();
+    format!("{cleaned:0>10}")
+}
+
 impl RowFilters {
     pub fn new(
         exclusions: Vec<String>,
@@ -23,7 +34,10 @@ impl RowFilters {
         earliest_start_date: Option<NaiveDateTime>,
     ) -> Self {
         RowFilters {
-            exclusions,
+            exclusions: exclusions
+                .iter()
+                .map(|id| normalise_request_id(id))
+                .collect(),
             status_exclusions,
             earliest_start_date,
         }
@@ -57,7 +71,7 @@ impl RowFilters {
 
         record
             .get_request_id(request_id_index)
-            .map(|id| self.exclusions.contains(&id))
+            .map(|id| self.exclusions.contains(&normalise_request_id(&id)))
             .unwrap_or(false)
     }
 
@@ -128,3 +142,57 @@ impl FilterableRecord for Vec<&Data> {
         })
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use csv::StringRecord;
+
+    fn row(cells: &[&str]) -> StringRecord {
+        StringRecord::from(cells.to_vec())
+    }
+
+    fn excluding(id: &str) -> RowFilters {
+        RowFilters::new(vec![id.to_string()], vec![], None)
+    }
+
+    fn skips_exclusion(filters: &RowFilters, request_id: &str) -> bool {
+        filters.should_skip(
+            &row(&[request_id, "UnFilled Bank", "2026-07-30 00:00:00"]),
+            0,
+            Some(1),
+            2,
+        )
+    }
+
+    #[test]
+    fn excludes_apostrophe_prefixed_request_id_against_clean_exclusion() {
+        assert!(skips_exclusion(&excluding("0726154700"), "'0726154700"));
+    }
+
+    #[test]
+    fn excludes_request_id_with_dropped_leading_zero() {
+        assert!(skips_exclusion(&excluding("0726154700"), "726154700"));
+    }
+
+    #[test]
+    fn normalises_dirty_exclusion_entries_too() {
+        assert!(skips_exclusion(&excluding("'0726154700"), "0726154700"));
+    }
+
+    #[test]
+    fn keeps_request_id_not_in_the_exclusion_set() {
+        assert!(!skips_exclusion(&excluding("0726154700"), "'0726154701"));
+    }
+
+    #[test]
+    fn recalled_rows_bypass_the_exclusion() {
+        let filters = excluding("0726154700");
+        assert!(!filters.should_skip(
+            &row(&["'0726154700", "Recalled", "2026-07-30 00:00:00"]),
+            0,
+            Some(1),
+            2
+        ));
+    }
+}

data/lib/csv_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CsvUtils
-  VERSION = '0.1.24'
+  VERSION = '0.1.25'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patchwork_csv_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: arm64-darwin
 authors:
 - kingsley.hendrickse
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-11-14 00:00:00.000000000 Z
+date: 2026-07-24 00:00:00.000000000 Z
 dependencies: []
 description: Deduplication of CSV files and XLS to CSV conversion.
 email: