diff --git a/app/models/library_staff_record.rb b/app/models/library_staff_record.rb index 517faa8..20f4b73 100644 --- a/app/models/library_staff_record.rb +++ b/app/models/library_staff_record.rb @@ -34,9 +34,9 @@ def self.new_from_csv(row) record.building = row[8] record.department = row[9] record.unit = row[11] - record.areas_of_study = row[14]&.split('//') + record.areas_of_study = row[14]&.gsub('//', ', ') record.my_scheduler_link = row[18] - record.other_entities = row[19]&.split('//') + record.other_entities = row[19]&.gsub('//', ', ') record.library_title = title record.title = title record.save! if record.valid? diff --git a/app/services/library_staff_loading_service.rb b/app/services/library_staff_loading_service.rb index e9e9f36..c6f3b50 100644 --- a/app/services/library_staff_loading_service.rb +++ b/app/services/library_staff_loading_service.rb @@ -12,7 +12,7 @@ def class_to_load def expected_headers %w[puid netid phone name lastName firstName email address building department division - unit team title areasOfStudy websiteUrl bios expertise mySchedulerLink] + unit team title areasOfStudy websiteUrl bios expertise mySchedulerLink otherEntities] end def uri diff --git a/spec/fixtures/files/library_staff/staff-directory-blank-lines.csv b/spec/fixtures/files/library_staff/staff-directory-blank-lines.csv index 9aa84c6..e755390 100644 --- a/spec/fixtures/files/library_staff/staff-directory-blank-lines.csv +++ b/spec/fixtures/files/library_staff/staff-directory-blank-lines.csv @@ -1,4 +1,4 @@ -puid,netid,phone,name,lastName,firstName,email,address,building,department,division,unit,team,title,areasOfStudy,websiteUrl,bios,expertise,mySchedulerLink -,,,,,,,,,,,,,,,,,, -"000000001","lucyfs","(555) 123-1234","Stardust, Lucy","Stardust","Lucy Fae",lucyfs@princeton.edu,Forrestal,Recap Library,Office of the Deputy Dean of Libraries,Facilities,,,"Pest Removal Specialist",,,,, -,,,,,,,,,,,,,,,,,, +puid,netid,phone,name,lastName,firstName,email,address,building,department,division,unit,team,title,areasOfStudy,websiteUrl,bios,expertise,mySchedulerLink,otherEntities +,,,,,,,,,,,,,,,,,,, +"000000001","lucyfs","(555) 123-1234","Stardust, Lucy","Stardust","Lucy Fae",lucyfs@princeton.edu,Forrestal,Recap Library,Office of the Deputy Dean of Libraries,Facilities,,,"Pest Removal Specialist",,,,,, +,,,,,,,,,,,,,,,,,,, diff --git a/spec/fixtures/files/library_staff/staff-directory.csv b/spec/fixtures/files/library_staff/staff-directory.csv index b273fab..5baec64 100644 --- a/spec/fixtures/files/library_staff/staff-directory.csv +++ b/spec/fixtures/files/library_staff/staff-directory.csv @@ -1,5 +1,5 @@ -"puid","netid","phone","name","lastName","firstName",email,address,building,department,division,unit,team,"title","areasOfStudy","websiteUrl","bios","expertise","mySchedulerLink" -"000000001","lucyfs","(555) 123-1234","Stardust, Lucy","Stardust","Lucy Fae",lucyfs@princeton.edu,Forrestal,Recap Library,Office of the Deputy Dean of Libraries,Facilities,,,"Pest Removal Specialist",,,,, -"000000002","nimbuskt","(555) 111-1111","Trout, Nimbus","Trout","Nimbus Kilgore",nibmus@princeton.edu,A-200,Firestone Library,Office of the Deputy Dean of Libraries,Information Technology,IT Operations and Digitization,,"Nap Coordinator","Naps//Coordination",,,, -"000000003","tiberius","(555) 222-2222","Adams, Tiberius","Adams","Spot Tiberius",tiberius@princeton.edu,B-300,Firestone Library,My Department,Library - Collections and Access Services,Access & Fulfillment Services,,"Lead Hairball Engineer",,,,, -"000000010","brutus","(555) 222-2222","Cat, Brutus","Cat","Brutus The",brutus@princeton.edu,B-300,Stokes Library,My Department,Library - Collections and Access Services,PCRP - Physical Collections Receipt & Processing Unit,,"Fluffiest cat",,,,, +"puid","netid","phone","name","lastName","firstName",email,address,building,department,division,unit,team,"title","areasOfStudy","websiteUrl","bios","expertise","mySchedulerLink","otherEntities" +"000000001","lucyfs","(555) 123-1234","Stardust, Lucy","Stardust","Lucy Fae",lucyfs@princeton.edu,Forrestal,Recap Library,Office of the Deputy Dean of Libraries,Facilities,,,"Pest Removal Specialist",,,,,,"MS Chadha Center for Global India" +"000000002","nimbuskt","(555) 111-1111","Trout, Nimbus","Trout","Nimbus Kilgore",nibmus@princeton.edu,A-200,Firestone Library,Office of the Deputy Dean of Libraries,Information Technology,IT Operations and Digitization,,"Nap Coordinator","Naps//Coordination",,,,,"Center for Culture, Society and Religion//University Center for Human Values" +"000000003","tiberius","(555) 222-2222","Adams, Tiberius","Adams","Spot Tiberius",tiberius@princeton.edu,B-300,Firestone Library,My Department,Library - Collections and Access Services,Access & Fulfillment Services,,"Lead Hairball Engineer",,,,,,"Center for International Security Studies (CISS)//Center for the Study of Democratic Politics (CSDP)//Empirical Studies of Conflict (ESOC)//Innovations for Successful Societies (ISS)//Liechtenstein Institute on Self-Determination (LISD)//Niehaus Center for lization and Governance (NCGG)//Princeton Survey Research Center (SRC)//Research Program in Political Economy (RPPE)" +"000000010","brutus","(555) 222-2222","Cat, Brutus","Cat","Brutus The",brutus@princeton.edu,B-300,Stokes Library,My Department,Library - Collections and Access Services,PCRP - Physical Collections Receipt & Processing Unit,,"Fluffiest cat",,,,,, diff --git a/spec/models/library_staff_record_spec.rb b/spec/models/library_staff_record_spec.rb index 3d0e9b2..adbd563 100644 --- a/spec/models/library_staff_record_spec.rb +++ b/spec/models/library_staff_record_spec.rb @@ -30,5 +30,10 @@ expect(results[0].first_name).to eq('Nimbus Kilgore') expect(results[1].first_name).to eq('Spot Tiberius') end + it "finds records by other entities" do + results = described_class.query('Center for Global') + expect(results.length).to eq(1) + expect(results[0].other_entities).to eq('MS Chadha Center for Global India') + end end end