Skip to content

Commit 7462d4b

Browse files
authored
Merge pull request #5569 from nhsuk/make-disease-types-not-null
Make `disease_types` not null
2 parents a0ed5a6 + 69498ec commit 7462d4b

6 files changed

Lines changed: 11 additions & 17 deletions

File tree

app/models/vaccination_record.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# delivery_method :integer
1010
# delivery_site :integer
1111
# discarded_at :datetime
12-
# disease_types :enum is an Array
12+
# disease_types :enum not null, is an Array
1313
# dose_sequence :integer
1414
# full_dose :boolean
1515
# local_patient_id_uri :string
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# frozen_string_literal: true
2+
3+
class MakeVaccinationRecordDiseaseTypesNotNull < ActiveRecord::Migration[8.1]
4+
def change
5+
change_column_null :vaccination_records, :disease_types, false
6+
end
7+
end

db/schema.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,7 @@
935935
t.integer "delivery_method"
936936
t.integer "delivery_site"
937937
t.datetime "discarded_at"
938-
t.enum "disease_types", array: true, enum_type: "disease_type"
938+
t.enum "disease_types", null: false, array: true, enum_type: "disease_type"
939939
t.integer "dose_sequence"
940940
t.boolean "full_dose"
941941
t.string "local_patient_id"

lib/tasks/data_migration.rake

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,4 @@ namespace :data_migration do
55
task delete_clinic_session_notifications: :environment do
66
SessionNotification.where(type: [1, 2]).delete_all
77
end
8-
9-
desc "Set disease types on vaccination records."
10-
task set_disease_types: :environment do
11-
VaccinationRecord
12-
.includes(:vaccine)
13-
.where(disease_types: nil)
14-
.find_each do |vaccination_record|
15-
disease_types =
16-
vaccination_record.vaccine&.disease_types ||
17-
vaccination_record.programme.disease_types
18-
vaccination_record.update_columns(disease_types:)
19-
end
20-
end
218
end

spec/factories/vaccination_records.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# delivery_method :integer
1010
# delivery_site :integer
1111
# discarded_at :datetime
12-
# disease_types :enum is an Array
12+
# disease_types :enum not null, is an Array
1313
# dose_sequence :integer
1414
# full_dose :boolean
1515
# local_patient_id_uri :string

spec/models/vaccination_record_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# delivery_method :integer
1010
# delivery_site :integer
1111
# discarded_at :datetime
12-
# disease_types :enum is an Array
12+
# disease_types :enum not null, is an Array
1313
# dose_sequence :integer
1414
# full_dose :boolean
1515
# local_patient_id_uri :string

0 commit comments

Comments
 (0)