patchwork_csv_utils 0.1.24-aarch64-linux → 0.1.25-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2a4f0279fe4f7e8bb2ac99679765184f8e0e532fbc16c1e10ead5cc64311ec4
-  data.tar.gz: 765ece8e2414a957b04b0b29e8c83e58c8caaa41a5720796543a44702fb3bf73
+  metadata.gz: 428e2f4abd57105c275a4391288a71fabfc5cae964ba8c7b825027d71164b446
+  data.tar.gz: 7f717a0d5577da392d8f11a71e9117c65762b6da973314443378837c56acd97d
 SHA512:
-  metadata.gz: c402279b8b631c2501a4f1be63eafc0ef41c0b7615291e78580365d43ef06649743d6d25d25f24d266a601ff880c9ec3ab25d8bb135fa3d422a8155100d96a34
-  data.tar.gz: 33f0926fbd5e8418c6941f65e3d6ea27438602b7adbe61cc923cc601e0ed089a6ba522e0acb52d076d04b877db3a8213888e6a40f66d195989ae59ac8eb87928
+  metadata.gz: c9d64bc47d070017c3d5311cb1f0083ca82c6892f6ad644938fa38e3b8bb2e5571952a0c097b0069f15a1e25af6c3bb9e7f08e821763633e382682a741a16fe3
+  data.tar.gz: 0ef2e4c2597e023d8fa85dc6100a1672e54f6250840e668b997c946852cbbb5bec5a7c951cb798f05ba345b7dee97b2d8172681708790a3d1a3215141d414e26

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: aarch64-linux
 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: