Skip to content

Commit 33b59fc

Browse files
Update school.name in reporting api totals view
This makes them consistent with the rest of Mavis.
1 parent eab53a3 commit 33b59fc

4 files changed

Lines changed: 12 additions & 10 deletions

File tree

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
# frozen_string_literal: true
2+
13
class UpdateReportingAPITotalsToVersion4 < ActiveRecord::Migration[8.1]
24
def change
35
update_view :reporting_api_totals,
4-
version: 4,
5-
revert_to_version: 3,
6-
materialized: true
6+
version: 4,
7+
revert_to_version: 3,
8+
materialized: true
79
end
810
end

db/schema.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
# It's strongly recommended that you check this file into your version control system.
1212

13-
ActiveRecord::Schema[8.1].define(version: 2026_01_19_161311) do
13+
ActiveRecord::Schema[8.1].define(version: 2026_01_22_093544) do
1414
# These are extensions that must be enabled in order to support this database
1515
enable_extension "pg_catalog.plpgsql"
1616
enable_extension "pg_trgm"
@@ -1387,8 +1387,8 @@
13871387
END AS patient_school_urn,
13881388
CASE
13891389
WHEN (school.name IS NOT NULL) THEN school.name
1390-
WHEN (pat.home_educated = true) THEN 'Home educated'::text
1391-
ELSE 'Unknown'::text
1390+
WHEN (pat.home_educated = true) THEN 'Home-schooled'::text
1391+
ELSE 'Unknown school'::text
13921392
END AS patient_school_name,
13931393
(ar.patient_id IS NOT NULL) AS is_archived,
13941394
(EXISTS ( SELECT 1

db/views/reporting_api_totals_v04.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ SELECT
3636
END AS patient_school_urn,
3737
CASE
3838
WHEN school.name IS NOT NULL THEN school.name
39-
WHEN pat.home_educated = true THEN 'Home educated'
40-
ELSE 'Unknown'
39+
WHEN pat.home_educated = true THEN 'Home-schooled'
40+
ELSE 'Unknown school'
4141
END AS patient_school_name,
4242

4343
-- Status flags

spec/controllers/api/reporting/totals_controller_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,12 +242,12 @@
242242
expect(school_two_data["vaccinated"]).to eq(1)
243243
expect(school_two_data["not_vaccinated"]).to eq(0)
244244

245-
expect(home_educated_data["school_name"]).to eq("Home educated")
245+
expect(home_educated_data["school_name"]).to eq("Home-schooled")
246246
expect(home_educated_data["cohort"]).to eq(1)
247247
expect(home_educated_data["vaccinated"]).to eq(0)
248248
expect(home_educated_data["not_vaccinated"]).to eq(1)
249249

250-
expect(unknown_data["school_name"]).to eq("Unknown")
250+
expect(unknown_data["school_name"]).to eq("Unknown school")
251251
expect(unknown_data["cohort"]).to eq(1)
252252
expect(unknown_data["vaccinated"]).to eq(0)
253253
expect(unknown_data["not_vaccinated"]).to eq(1)

0 commit comments

Comments
 (0)