patchwork_csv_utils 0.1.21-aarch64-linux → 0.1.23-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aca603756d24698f85aee053ff0d3684216d2b209c246ae46d695864f9b69229
-  data.tar.gz: 3077975203564e253de4ec9968611d58f3d486e9a16100ebe2df913fc1d5fe26
+  metadata.gz: 6df6491a9c17a0d4a1b59317b03b538928c08a03e4aa2391378e5d2407a86f28
+  data.tar.gz: 60a1ff9624bfb08ac17b92829afb6384bb509506fdf42a3ae693e96aeb2f7275
 SHA512:
-  metadata.gz: 177c8082986e0e48ab4852f11fd082475117cd0aef6c13fbf44951ca9f6712202b641224a070f339fb288c0c264aec5d0a9a9df711c1e8e3bdc0905dc751b53b
-  data.tar.gz: f6132a683eede976ae4788bb9126322e2de9b262d9c1ef4ac6d63b9a402a66e98d72dbe4f2269e3c40650519145903791cf4929c642a3d0e8c38f008644adbed
+  metadata.gz: 1e5e29a1d67ea11d7bc2086518b2955af94480a5039976c5674317e61e59bb3664aa1c8701cdbcf0d748042e191e0e4ab6290f5438ec9b9c407b476668f68a1f
+  data.tar.gz: 57d32644e07ec2566af7745cd042d10ccadb9efd270deb68392389a3c174fae54af39ee4666288f012b59dd294b4d124487d83531a3e1cb2ec07748fbbbfa489

data/.ruby-version

@@ -0,0 +1 @@
+ruby-3.0.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    patchwork_csv_utils (0.1.21)
+    patchwork_csv_utils (0.1.23)
 
 GEM
   remote: https://rubygems.org/
@@ -56,6 +56,7 @@ GEM
 PLATFORMS
   arm64-darwin-22
   arm64-darwin-23
+  arm64-darwin-24
   x86_64-linux
 
 DEPENDENCIES

data/ext/csv_utils/src/lib.rs

@@ -9,7 +9,7 @@ pub mod utils;
 fn init() -> Result<(), magnus::Error> {
     let module = define_module("CsvUtils")?;
     module.define_singleton_method("dedup", function!(dedup, 4))?;
-    module.define_singleton_method("to_csv", function!(to_csv, 7))?;
-    module.define_singleton_method("transform_csv", function!(transform_csv, 7))?;
+    module.define_singleton_method("to_csv", function!(to_csv, 8))?;
+    module.define_singleton_method("transform_csv", function!(transform_csv, 8))?;
     Ok(())
 }

data/ext/csv_utils/src/utils/csv.rs

@@ -1,21 +1,27 @@
-use chrono::{NaiveDate, NaiveDateTime, NaiveTime, Utc};
+use chrono::{NaiveDateTime, NaiveTime, Utc};
 use csv::{Reader, StringRecord, Writer};
 use magnus::{Error, RArray, Ruby};
 use std::collections::HashMap;
 use std::fs::File;
 
-use crate::utils::{check_mandatory_headers, create_header_map, headers_as_byte_record, index_of_header_in_mandatory_list, magnus_err, missing_header, missing_value, to_datetime_error, FileExtension};
+use crate::utils::{check_mandatory_headers, correct_datetime, create_header_map, headers_as_byte_record, index_of_header_in_mandatory_list, magnus_err, missing_header, missing_value, string_to_datetime, to_datetime_error, FileExtension};
 
-pub fn transform_csv(ruby: &Ruby, csv_path: String,
-                     target_path: String, exclusions: RArray,
+pub fn transform_csv(ruby: &Ruby,
+                     csv_path: String,
+                     target_path: String,
+                     exclusions: RArray,
                      mandatory_headers: RArray,
                      status_exclusions: RArray,
                      expected_trust_name: String,
-                     is_streamed_file: bool) -> magnus::error::Result<()> {
+                     is_streamed_file: bool,
+                     earliest_start_date: Option<String>) -> magnus::error::Result<()> {
     if !csv_path.has_extension(&["csv"]) {
         return Err(Error::new(ruby.exception_standard_error(), "csv_path must be a csv file".to_string()));
     }
 
+    let start_date = earliest_start_date
+        .and_then(|date_str| string_to_datetime(&date_str));
+
     let exclusions = RArray::to_vec(exclusions)?;
     let status_exclusions = RArray::to_vec(status_exclusions)?;
     let mandatory_headers: Vec<String> = RArray::to_vec(mandatory_headers)?;
@@ -48,7 +54,8 @@ pub fn transform_csv(ruby: &Ruby, csv_path: String,
 
     for (ri, record) in mandatory_records.iter().enumerate() {
 
-        if skip_excluded_rows(request_id, &record, &exclusions) { continue; }
+        if skip_rows_before_start_date(&start_date, &record, &date) { continue; }
+        if skip_excluded_rows(request_id, &status, &record, &exclusions) { continue; }
         if skip_excluded_status_rows(&status, &record, &status_exclusions) { continue; }
         if has_empty_row_skip(&record) { continue; }
         if has_empty_first_col_skip_row(&record) { continue; }
@@ -140,27 +147,36 @@ fn get_column_name(inverse_header_map: &HashMap<usize, String>, i: &usize) -> St
     column_name.to_string()
 }
 
-fn skip_excluded_rows(request_id: &usize, r: &StringRecord, exclusions: &Vec<String>) -> bool {
+fn skip_excluded_rows(request_id: &usize, status: &Option<&usize>, r: &StringRecord, exclusions: &Vec<String>) -> bool {
+    if let Some(status_index) = status {
+        if let Some(status) = r.get(**status_index) {
+            if status.eq("Recalled") {
+                return false
+            }
+        }
+    }
+
     let value = r.get(*request_id).unwrap_or_default();
     exclusions.contains(&value.to_string())
 }
 
+fn skip_rows_before_start_date(&start_date: &Option<NaiveDateTime>, r: &StringRecord, date_index: &usize) -> bool {
+    if let Some(start_date) = start_date {
+        if let Some(date_str) = r.get(*date_index) {
+            if let Some(date) = string_to_datetime(date_str) {
+                return date <= start_date;
+            }
+        }
+    }
+    false
+}
+
 fn skip_excluded_status_rows(status: &Option<&usize>, r: &StringRecord, exclusions: &Vec<String>) -> bool {
     status
         .map(|index| exclusions.contains(&r[*index].to_string()))
         .unwrap_or(false)
 }
 
-fn string_to_datetime(s: &str) -> Option<NaiveDateTime> {
-    let maybe_correct = correct_datetime(s);
-    if maybe_correct.is_some() { return maybe_correct; }
-
-    NaiveDate::parse_from_str(s, "%d-%b-%y").ok().map(|d| d.and_hms_opt(0, 0, 0)).flatten()
-}
-
-fn correct_datetime(s: &str) -> Option<NaiveDateTime> {
-    NaiveDateTime::parse_from_str(s, "%Y-%m-%d %H:%M:%S").ok()
-}
 
 fn string_to_time(s: &str) -> Option<NaiveTime> {
     NaiveTime::parse_from_str(s, "%H:%M").ok()

data/ext/csv_utils/src/utils/mod.rs

@@ -4,6 +4,7 @@ use std::ffi::OsStr;
 use std::path::Path;
 use ::csv::{ByteRecord, StringRecord};
 use magnus::Ruby;
+use chrono::{NaiveDate, NaiveDateTime};
 
 pub mod csv;
 pub mod dedup;
@@ -83,3 +84,19 @@ impl<P: AsRef<Path>> FileExtension for P {
     }
 }
 
+pub fn string_to_datetime(s: &str) -> Option<NaiveDateTime> {
+    let maybe_correct = correct_datetime(s);
+    if maybe_correct.is_some() { return maybe_correct; }
+
+    // Try YYYY-MM-DD format
+    if let Ok(date) = NaiveDate::parse_from_str(s, "%Y-%m-%d") {
+        return date.and_hms_opt(0, 0, 0);
+    }
+
+    NaiveDate::parse_from_str(s, "%d-%b-%y").ok().map(|d| d.and_hms_opt(0, 0, 0)).flatten()
+}
+
+pub fn correct_datetime(s: &str) -> Option<NaiveDateTime> {
+    NaiveDateTime::parse_from_str(s, "%Y-%m-%d %H:%M:%S").ok()
+}
+

data/ext/csv_utils/src/utils/xls.rs

@@ -2,11 +2,11 @@ use std::collections::HashMap;
 use std::fs::File;
 use std::io::{BufWriter, Write};
 
-use calamine::{open_workbook_auto, Data, Range, Reader};
+use calamine::{open_workbook_auto, Data, DataType, Range, Reader};
 use chrono::{NaiveDateTime, Timelike, Utc};
 use magnus::{RArray, Ruby};
 
-use crate::utils::{check_mandatory_headers, index_of_header_in_mandatory_list, magnus_err, missing_header, missing_value, to_datetime_error, FileExtension};
+use crate::utils::{check_mandatory_headers, index_of_header_in_mandatory_list, magnus_err, missing_header, missing_value, string_to_datetime, to_datetime_error, FileExtension};
 
 pub fn to_csv(ruby: &Ruby, xls_path: String,
               target_path: String,
@@ -14,7 +14,8 @@ pub fn to_csv(ruby: &Ruby, xls_path: String,
               mandatory_headers: RArray,
               status_exclusions: RArray,
               expected_trust_name: String,
-              is_streamed_file: bool
+              is_streamed_file: bool,
+              earliest_start_date: Option<String>
 ) -> magnus::error::Result<()> {
     if !xls_path.has_extension(&["xls","xlsx"]) {
         return Err(magnus::Error::new(ruby.exception_standard_error(), "xls_path must be an xls or xlsx file".to_string()));
@@ -23,6 +24,9 @@ pub fn to_csv(ruby: &Ruby, xls_path: String,
     let exclusions = RArray::to_vec(exclusions)?;
     let mandatory_headers: Vec<String> = RArray::to_vec(mandatory_headers)?;
     let status_exclusions = RArray::to_vec(status_exclusions)?;
+    
+    let start_date = earliest_start_date
+        .and_then(|date_str| string_to_datetime(&date_str));
 
     let mut workbook = open_workbook_auto(&xls_path)
         .map_err(|e| magnus_err(ruby, e, format!("could not open workbook: {}", xls_path).as_str()))?;
@@ -41,7 +45,7 @@ pub fn to_csv(ruby: &Ruby, xls_path: String,
     let csv_out_file = File::create(target_path.clone()).map_err(|e| magnus_err(ruby, e, format!("could not create csv file: {}", target_path).as_str()))?;
     let mut dest = BufWriter::new(csv_out_file);
 
-    write_csv(ruby, &mut dest, &range, header_map, exclusions, mandatory_headers, headers_list, status_exclusions, expected_trust_name, is_streamed_file)
+    write_csv(ruby, &mut dest, &range, header_map, exclusions, mandatory_headers, headers_list, status_exclusions, expected_trust_name, is_streamed_file, start_date)
 }
 
 fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>,
@@ -50,7 +54,8 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>,
                        headers_list: Vec<String>,
                        status_exclusions: Vec<String>,
                        expected_trust_name: String,
-                       is_streamed_file: bool) -> magnus::error::Result<()> {
+                       is_streamed_file: bool,
+                       start_date: Option<NaiveDateTime>) -> magnus::error::Result<()> {
     let n = mandatory_headers.len() - 1;
     let request_id = header_map.get("Request Id").ok_or(missing_header(ruby, "Request Id"))?;
     let date = header_map.get("Date").ok_or(missing_header(ruby, "Date"))?;
@@ -66,7 +71,8 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>,
     for (ri, r) in mandatory_rows.into_iter().enumerate() {
         let mut date_value = Utc::now().naive_utc();
 
-        if skip_excluded_rows(&request_id, &r, &exclusions) { continue; }
+        if skip_rows_before_start_date(&start_date, &r, &date) { continue; }
+        if skip_excluded_rows(&request_id, &status, &r, &exclusions) { continue; }
         if skip_excluded_status_rows(&status, &r, &status_exclusions) { continue; }
         if skip_empty_rows(&r) { continue; }
         if skip_rows_with_no_request_id(&request_id, &r) { continue; }
@@ -185,7 +191,17 @@ fn date_value_is_not_present(date: &usize, r: &Vec<&Data>) -> bool {
     r[*date] == &Data::Empty
 }
 
-fn skip_excluded_rows(request_id: &usize, r: &Vec<&Data>, exclusions: &Vec<String>) -> bool {
+fn skip_excluded_rows(request_id: &usize, status: &Option<&usize>, r: &Vec<&Data>, exclusions: &Vec<String>) -> bool {
+    if let Some(status_index) = status {
+        if let Some(status) = r.get(**status_index) {
+            if let Some(status_str) = status.as_string() {
+                if status_str.eq("Recalled") {
+                    return false
+                }
+            }
+        }
+    }
+
     let value = r[*request_id].to_string();
     exclusions.contains(&value.to_string())
 }
@@ -204,6 +220,27 @@ fn skip_rows_with_no_request_id(request_id: &usize, r: &Vec<&Data>) -> bool {
     r[*request_id] == &Data::Empty
 }
 
+fn skip_rows_before_start_date(start_date: &Option<NaiveDateTime>, r: &Vec<&Data>, date_index: &usize) -> bool {
+    if let Some(start_date) = start_date {
+        if let Some(date_data) = r.get(*date_index) {
+            match date_data {
+                Data::DateTime(d) => {
+                    if let Some(date) = d.as_datetime() {
+                        return date <= *start_date;
+                    }
+                }
+                Data::DateTimeIso(s) => {
+                    if let Some(date) = string_to_datetime(s) {
+                        return date <= *start_date;
+                    }
+                }
+                _ => {}
+            }
+        }
+    }
+    false
+}
+
 fn transform_time_to_datetime(t1: NaiveDateTime, t2: NaiveDateTime) -> NaiveDateTime {
     NaiveDateTime::new(t1.date(), t2.time())
 }

data/lib/csv_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patchwork_csv_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.23
 platform: aarch64-linux
 authors:
 - kingsley.hendrickse
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-04-14 00:00:00.000000000 Z
+date: 2025-07-08 00:00:00.000000000 Z
 dependencies: []
 description: Deduplication of CSV files and XLS to CSV conversion.
 email:
@@ -19,6 +19,7 @@ extra_rdoc_files: []
 files:
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - Cargo.lock
 - Cargo.toml
 - Gemfile