Fix MMRV health questions appearing in MMR consent forms

This addresses a bug where MMRV health questions got mixed in with
MMR health questions. This was because `programme.vaccines` wasn't
filtering the vaccines for MMR only.

Author: jhenderson

app/models/concerns/belongs_to_programme.rb

@@ -15,7 +15,10 @@ module BelongsToProgramme
 
             if disease_types.present?
               enum_values = disease_types.map { |dt| Vaccine.disease_types[dt] }
-              query.where("disease_types && ARRAY[?]::integer[]", enum_values)
+              query.where(
+                "array_sort(disease_types) = ARRAY[?]::integer[]",
+                enum_values.sort
+              )
             else
               query
             end

app/models/programme.rb

@@ -8,6 +8,14 @@ class Programme
   TYPES_SUPPORTING_DELEGATION = %w[flu].freeze
   MIN_MMRV_ELIGIBILITY_DATE = Date.new(2020, 1, 1).freeze
 
+  DISEASE_TYPES = {
+    "flu" => %w[influenza],
+    "hpv" => %w[human_papillomavirus],
+    "mmr" => %w[measles mumps rubella],
+    "td_ipv" => %w[tetanus diphtheria polio],
+    "menacwy" => %w[meningitis_a meningitis_c meningitis_w meningitis_y]
+  }.freeze
+
   attr_accessor :type
 
   def initialize(type:)
@@ -118,7 +126,7 @@ def is_catch_up?(year_group:)
   end
 
   def vaccines
-    @vaccines ||= Vaccine.where_programme(self)
+    @vaccines ||= Vaccine.where_programme(self, DISEASE_TYPES[type])
   end
 
   def vaccine_methods

app/models/programme_variant.rb

@@ -3,9 +3,7 @@
 class ProgrammeVariant < SimpleDelegator
   attr_reader :variant_type
 
-  DISTINGUISHING_DISEASE_TYPES = {
-    "mmrv" => ["varicella"] # MMR + Varicella = MMRV
-  }.freeze
+  DISEASE_TYPES = { "mmrv" => %w[measles mumps rubella varicella] }.freeze
 
   SNOMED_PROCEDURE_TERMS = { "mmrv" => "TBC" }.freeze
 
@@ -25,8 +23,7 @@ def name_in_sentence
   end
 
   def vaccines
-    @vaccines ||=
-      Vaccine.where_programme(self, DISTINGUISHING_DISEASE_TYPES[variant_type])
+    @vaccines ||= Vaccine.where_programme(self, DISEASE_TYPES[variant_type])
   end
 
   def snomed_procedure_term

config/vaccines.yml

@@ -186,7 +186,7 @@ vaxpro:
 
 # MMRV
 
-pro_quad :
+pro_quad:
   type: mmr
   brand: ProQuad
   method: injection

lib/tasks/vaccines.rake

@@ -349,8 +349,6 @@ def create_menacwy_health_questions(vaccine)
 end
 
 def create_mmr_health_questions(vaccine)
-  Flipper.enable(:mmrv)
-
   bleeding =
     vaccine.health_questions.create!(
       title: "Does your child have a bleeding disorder?"

spec/factories/vaccines.rb

@@ -34,7 +34,7 @@
     transient { programme { nil } }
 
     programme_type { programme&.type || Programme::TYPES.sample }
-
+    disease_types { Programme::DISEASE_TYPES[programme_type] }
     brand { Faker::Commerce.product_name }
     manufacturer { Faker::Company.name }
     sequence(:nivs_name) { |n| "#{brand.parameterize}-#{n}" }