Skip to content

Commit 28e3b9c

Browse files
committed
Remove COVID-19 vaccination field
1 parent 5771738 commit 28e3b9c

File tree

8 files changed

+33
-39
lines changed

8 files changed

+33
-39
lines changed

app/models/load.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
# Properties
1717
# ----------
1818
#
19-
# | | |
20-
# |:----------------------|:--------------------------------------------------------------------------------|
21-
# | `name` | The name of the passenger or a description of the cargo. |
22-
# | `slug` | The unique identifier derived from the `name`. |
23-
# | `weight` | The weight of the passenger (0 for cargo). |
24-
# | `bags_weight` | The weight of the passenger's bags (if any), or the weight of the cargo. |
25-
# | `covid19_vaccination` | `true` if the passenger is up-to-date on COVID-19 vaccinations (n/a for cargo). |
19+
# | | |
20+
# |:----------------------|:-----------------------------------------------------------------------------------------|
21+
# | `name` | The name of the passenger or a description of the cargo. |
22+
# | `slug` | The unique identifier derived from the `name`. |
23+
# | `weight` | The weight of the passenger (0 for cargo). |
24+
# | `bags_weight` | The weight of the passenger's bags (if any), or the weight of the cargo. |
25+
# | `covid19_vaccination` | `true` if the passenger is up-to-date on COVID-19 vaccinations (legacy) (n/a for cargo). |
2626

2727
class Load < ApplicationRecord
2828
belongs_to :flight

app/views/loads/_load.json.jbuilder

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
if load.destroyed?
44
json.call load, :slug, :destroyed?
55
else
6-
json.call load, :slug, :name, :weight, :bags_weight, :covid19_vaccination
6+
json.call load, :slug, :name, :weight, :bags_weight
77
end

app/views/loads/show.json.jbuilder

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# frozen_string_literal: true
22

3-
json.call @load, :slug, :name, :weight, :bags_weight, :covid19_vaccination
3+
json.call @load, :slug, :name, :weight, :bags_weight

spec/channels/loads_channel_spec.rb

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,10 @@
4040
expect { create :load, :cargo, flight: }.
4141
to(have_broadcasted_to(flight).with do |payload|
4242
expect(payload).to match_json_expression(
43-
slug: String,
44-
name: String,
45-
weight: 0,
46-
bags_weight: Integer,
47-
covid19_vaccination: false
43+
slug: String,
44+
name: String,
45+
weight: 0,
46+
bags_weight: Integer
4847
)
4948
end)
5049
end
@@ -53,11 +52,10 @@
5352
expect { @load.update! name: "new name" }.
5453
to(have_broadcasted_to(flight).with do |payload|
5554
expect(payload).to match_json_expression(
56-
slug: "new-name",
57-
name: "new name",
58-
weight: Integer,
59-
bags_weight: Integer,
60-
covid19_vaccination: Boolean
55+
slug: "new-name",
56+
name: "new name",
57+
weight: Integer,
58+
bags_weight: Integer
6159
)
6260
end)
6361
end

spec/requests/flights_spec.rb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,10 @@
7474
name: String
7575
},
7676
loads: [{
77-
slug: String,
78-
name: String,
79-
weight: Integer,
80-
bags_weight: Integer,
81-
covid19_vaccination: false
77+
slug: String,
78+
name: String,
79+
weight: Integer,
80+
bags_weight: Integer
8281
}] * 3
8382
)
8483
end

spec/requests/loads_spec.rb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,10 @@
2424
params: {load: load_params}
2525
expect(response).to be_successful
2626
expect(response.body).to match_json_expression(
27-
slug: String,
28-
name: String,
29-
weight: Integer,
30-
bags_weight: Integer,
31-
covid19_vaccination: Boolean
27+
slug: String,
28+
name: String,
29+
weight: Integer,
30+
bags_weight: Integer
3231
)
3332

3433
expect(flight.loads.count).to eq(1)

spec/requests/pilot/flights_spec.rb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,10 @@
119119
name: String
120120
},
121121
loads: [{
122-
slug: String,
123-
name: String,
124-
weight: Integer,
125-
bags_weight: Integer,
126-
covid19_vaccination: false
122+
slug: String,
123+
name: String,
124+
weight: Integer,
125+
bags_weight: Integer
127126
}] * 3
128127
)
129128

spec/requests/pilot/loads_spec.rb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,10 @@
4343
name: String
4444
},
4545
loads: [{
46-
slug: String,
47-
name: String,
48-
weight: Integer,
49-
bags_weight: Integer,
50-
covid19_vaccination: Boolean
46+
slug: String,
47+
name: String,
48+
weight: Integer,
49+
bags_weight: Integer
5150
}]
5251
)
5352

0 commit comments

Comments
 (0)