Skip to content

Commit d2c8ae3

Browse files
authored
Merge pull request #624 from codeRIT/hm-534a
fix: Fixes missing name error and race condition in data exports
2 parents 6a07afb + 9cb5c16 commit d2c8ae3

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

app/jobs/generate_data_export_job.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ def generate__sponsor_dump(data_export, attendee_type)
5454
resume_paths = []
5555
questionnaires.each do |q|
5656
csv_row = [
57-
q.first_name,
58-
q.last_name,
57+
q.user.first_name,
58+
q.user.last_name,
59+
q.user.email,
5960
q.school_name,
60-
q.email,
6161
q.vcs_url,
6262
q.portfolio_url,
6363
]
@@ -81,7 +81,7 @@ def generate__sponsor_dump(data_export, attendee_type)
8181
csvfile_name = "000-Attendees.csv"
8282
csvfile_path = File.join(folder_path, csvfile_name)
8383
CSV.open(csvfile_path, "wb") do |csv|
84-
csv << ["Fist name", "Last name", "School", "Email", "VCS URL", "Portfolio URL", "Resume filename"]
84+
csv << ["First name", "Last name", "Email", "School", "VCS URL", "Portfolio URL", "Resume Filename"]
8585
csv_data.each do |row|
8686
csv << row
8787
end

app/models/data_export.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ def queued?
4040
def enqueue!
4141
raise "Data export has already been queued" unless status == "created_not_queued"
4242

43-
GenerateDataExportJob.perform_later(self)
4443
update_attribute(:queued_at, Time.now)
44+
GenerateDataExportJob.perform_later(self)
4545
end
4646

4747
def status

0 commit comments

Comments
 (0)