@@ -38,7 +38,7 @@ class InvalidType < StandardError
3838 "flu" => %w[ Flu ] ,
3939 "hpv" => %w[ HPV ] ,
4040 "menacwy" => %w[ ACWYX4 MenACWY ] ,
41- "mmr" => %w[ MMR ] ,
41+ "mmr" => %w[ MMR MMRV ] ,
4242 "td_ipv" => %w[ 3-in-1 Td/IPV ]
4343 } . freeze
4444
@@ -124,17 +124,19 @@ def <=>(other) = type <=> other.type
124124
125125 def variant_type = nil
126126
127- def translation_key
128- mmr? && Flipper . enabled? ( :mmrv ) ? "mmr_and_mmrv" : type
129- end
127+ def translation_key = mmr? ? "mmr_and_mmrv" : type
130128
131129 TYPES . each do |programme_type |
132130 define_method ( "#{ programme_type } ?" ) { type == programme_type }
133131 end
134132
135- def name = I18n . t ( translation_key , scope : :programme_types )
133+ def name
134+ @name ||= I18n . t ( translation_key , scope : :programme_types )
135+ end
136136
137- def name_in_sentence = flu? ? name . downcase : name
137+ def name_in_sentence
138+ @name_in_sentence = flu? ? name . downcase : name
139+ end
138140
139141 def variant_for ( disease_types : nil , patient : nil )
140142 return self unless mmr?
@@ -152,12 +154,7 @@ def variant_for(disease_types: nil, patient: nil)
152154
153155 return self if eligible_for_mmrv . nil?
154156
155- variant_type =
156- if eligible_for_mmrv && Flipper . enabled? ( :mmrv )
157- "mmrv"
158- else
159- "mmr"
160- end
157+ variant_type = eligible_for_mmrv ? "mmrv" : "mmr"
161158
162159 Programme ::Variant . new ( self , variant_type :)
163160 end
@@ -212,15 +209,7 @@ def default_dose_sequence = hpv? || flu? ? 1 : nil
212209
213210 def maximum_dose_sequence = MAXIMUM_DOSE_SEQUENCES . fetch ( type )
214211
215- # TODO: add MMRV to IMPORT_NAMES once the MMRV flag is removed
216- def import_names
217- names = IMPORT_NAMES . fetch ( type )
218- if Flipper . enabled? ( :mmrv ) && type == "mmr"
219- names + %w[ MMRV ]
220- else
221- names
222- end
223- end
212+ def import_names = IMPORT_NAMES . fetch ( type )
224213
225214 def snomed_target_disease_codes = SNOMED_TARGET_DISEASE_CODES . fetch ( type )
226215
0 commit comments