Skip to content

Commit a17aba5

Browse files
author
Alistair Davidson
committed
also make event_timestamp_day/month/year not null, and populate essential fields in the factory
1 parent 390239f commit a17aba5

File tree

5 files changed

+22
-20
lines changed

5 files changed

+22
-20
lines changed

app/models/reporting_api/vaccination_event.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
#
77
# id :bigint not null, primary key
88
# event_timestamp :datetime not null
9-
# event_timestamp_academic_year :integer
10-
# event_timestamp_day :integer
11-
# event_timestamp_month :integer
12-
# event_timestamp_year :integer
9+
# event_timestamp_academic_year :integer not null
10+
# event_timestamp_day :integer not null
11+
# event_timestamp_month :integer not null
12+
# event_timestamp_year :integer not null
1313
# event_type :string not null
1414
# location_address_postcode :string
1515
# location_address_town :string

db/migrate/20250827100519_add_reporting_api_vaccination_events.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ def change
55
create_table :reporting_api_vaccination_events do |t|
66
t.string :event_type, null: false
77
t.datetime :event_timestamp, null: false
8-
t.integer :event_timestamp_year
9-
t.integer :event_timestamp_month
10-
t.integer :event_timestamp_day
11-
t.integer :event_timestamp_academic_year
8+
t.integer :event_timestamp_year, null: false
9+
t.integer :event_timestamp_month, null: false
10+
t.integer :event_timestamp_day, null: false
11+
t.integer :event_timestamp_academic_year, null: false
1212

1313
t.references :source, polymorphic: true
1414

db/schema.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -826,10 +826,10 @@
826826
create_table "reporting_api_vaccination_events", force: :cascade do |t|
827827
t.string "event_type", null: false
828828
t.datetime "event_timestamp", null: false
829-
t.integer "event_timestamp_year"
830-
t.integer "event_timestamp_month"
831-
t.integer "event_timestamp_day"
832-
t.integer "event_timestamp_academic_year"
829+
t.integer "event_timestamp_year", null: false
830+
t.integer "event_timestamp_month", null: false
831+
t.integer "event_timestamp_day", null: false
832+
t.integer "event_timestamp_academic_year", null: false
833833
t.string "source_type"
834834
t.bigint "source_id"
835835
t.bigint "patient_id", null: false

spec/factories/reporting_api_vaccination_events.rb

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
#
77
# id :bigint not null, primary key
88
# event_timestamp :datetime not null
9-
# event_timestamp_academic_year :integer
10-
# event_timestamp_day :integer
11-
# event_timestamp_month :integer
12-
# event_timestamp_year :integer
9+
# event_timestamp_academic_year :integer not null
10+
# event_timestamp_day :integer not null
11+
# event_timestamp_month :integer not null
12+
# event_timestamp_year :integer not null
1313
# event_type :string not null
1414
# location_address_postcode :string
1515
# location_address_town :string
@@ -79,6 +79,7 @@
7979
session { build(:session, location: location) }
8080
end
8181

82+
event_type { outcome }
8283
source do
8384
build(
8485
:vaccination_record,
@@ -90,6 +91,7 @@
9091
performed_by: User.first
9192
)
9293
end
94+
event_timestamp { source.performed_at }
9395
patient { for_patient }
9496
vaccination_record_outcome { outcome }
9597
patient_year_group { year_group }

spec/models/reporting_api/vaccination_event_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
#
77
# id :bigint not null, primary key
88
# event_timestamp :datetime not null
9-
# event_timestamp_academic_year :integer
10-
# event_timestamp_day :integer
11-
# event_timestamp_month :integer
12-
# event_timestamp_year :integer
9+
# event_timestamp_academic_year :integer not null
10+
# event_timestamp_day :integer not null
11+
# event_timestamp_month :integer not null
12+
# event_timestamp_year :integer not null
1313
# event_type :string not null
1414
# location_address_postcode :string
1515
# location_address_town :string

0 commit comments

Comments
 (0)