Remove SystmOne import feature flag (#3400)

This feature is ready to be enabled for all users so we can remove the
feature flag.

Author: thomasleese

app/models/immunisation_import_row.rb

@@ -152,43 +152,40 @@ def to_patient_session
   def batch_expiry = @data[:batch_expiry_date]
 
   def batch_name =
-    @data[:batch_number].presence || systm_one_data(:vaccination_batch_number)
+    @data[:batch_number].presence || @data[:vaccination_batch_number]
 
   def care_setting = @data[:care_setting]
 
-  def clinic_name =
-    @data[:clinic_name].presence || systm_one_data(:event_done_at)
+  def clinic_name = @data[:clinic_name].presence || @data[:event_done_at]
 
-  def combined_vaccination_and_dose_sequence = systm_one_data(:vaccination_type)
+  def combined_vaccination_and_dose_sequence = @data[:vaccination_type]
 
   def date_of_vaccination =
-    @data[:date_of_vaccination].presence || systm_one_data(:event_date)
+    @data[:date_of_vaccination].presence || @data[:event_date]
 
   def delivery_site = @data[:anatomical_site]
 
   def dose_sequence = @data[:dose_sequence]
 
-  def location_type = systm_one_data(:event_location_type)
+  def location_type = @data[:event_location_type]
 
   def notes = @data[:notes]
 
   def patient_date_of_birth =
-    @data[:person_dob].presence || systm_one_data(:date_of_birth)
+    @data[:person_dob].presence || @data[:date_of_birth]
 
   def patient_first_name =
-    @data[:person_forename].presence || systm_one_data(:first_name)
+    @data[:person_forename].presence || @data[:first_name]
 
   def patient_gender_code =
     @data[:person_gender_code].presence || @data[:person_gender].presence ||
-      systm_one_data(:sex)
+      @data[:sex]
 
-  def patient_last_name =
-    @data[:person_surname].presence || systm_one_data(:surname)
+  def patient_last_name = @data[:person_surname].presence || @data[:surname]
 
   def patient_nhs_number = @data[:nhs_number]
 
-  def patient_postcode =
-    @data[:person_postcode].presence || systm_one_data(:postcode)
+  def patient_postcode = @data[:person_postcode].presence || @data[:postcode]
 
   def performed_by_email = @data[:performing_professional_email]
 
@@ -203,15 +200,15 @@ def programme_name = @data[:programme]
   def reason_not_administered = @data[:reason_not_vaccinated]
 
   def school_name =
-    @data[:school_name].presence || systm_one_data(:school).presence ||
-      systm_one_data(:event_done_at)
+    @data[:school_name].presence || @data[:school].presence ||
+      @data[:event_done_at]
 
-  def school_urn = @data[:school_urn].presence || systm_one_data(:school_code)
+  def school_urn = @data[:school_urn].presence || @data[:school_code]
 
   def session_id = @data[:session_id]
 
   def time_of_vaccination =
-    @data[:time_of_vaccination].presence || systm_one_data(:event_time)
+    @data[:time_of_vaccination].presence || @data[:event_time]
 
   def uuid = @data[:uuid]
 
@@ -221,14 +218,6 @@ def vaccine_name = @data[:vaccine_given]
 
   private
 
-  def systm_one_enabled?
-    @systm_one_enabled ||= Flipper.enabled?(:systm_one_import)
-  end
-
-  def systm_one_data(key)
-    systm_one_enabled? ? @data[key] : nil
-  end
-
   def location_name
     return unless session.nil? || session.location.generic_clinic?
 
@@ -494,14 +483,10 @@ def validate_batch_name
     if administered
       if offline_recording?
         if batch_name.nil?
-          if systm_one_enabled?
-            errors.add(
-              :base,
-              "<code>BATCH_NUMBER</code> or <code>Vaccination batch number</code> is required"
-            )
-          else
-            errors.add(:base, "<code>BATCH_NUMBER</code> is required")
-          end
+          errors.add(
+            :base,
+            "<code>BATCH_NUMBER</code> or <code>Vaccination batch number</code> is required"
+          )
         elsif batch_name.blank?
           errors.add(batch_name.header, "Enter a batch number.")
         end
@@ -526,14 +511,10 @@ def validate_care_setting
   def validate_clinic_name
     if offline_recording? && is_community_setting?
       if clinic_name.nil?
-        if systm_one_enabled?
-          errors.add(
-            :base,
-            "<code>CLINIC_NAME</code> or <code>Event done at</code> is required"
-          )
-        else
-          errors.add(:base, "<code>CLINIC_NAME</code> is required")
-        end
+        errors.add(
+          :base,
+          "<code>CLINIC_NAME</code> or <code>Event done at</code> is required"
+        )
       elsif clinic_name.blank?
         errors.add(clinic_name.header, "Enter a clinic name")
       elsif !organisation.community_clinics.exists?(name: clinic_name.to_s)
@@ -544,14 +525,10 @@ def validate_clinic_name
 
   def validate_date_of_vaccination
     if date_of_vaccination.nil?
-      if systm_one_enabled?
-        errors.add(
-          :base,
-          "<code>DATE_OF_VACCINATION</code> or <code>Event date</code> is required"
-        )
-      else
-        errors.add(:base, "<code>DATE_OF_VACCINATION</code> is required")
-      end
+      errors.add(
+        :base,
+        "<code>DATE_OF_VACCINATION</code> or <code>Event date</code> is required"
+      )
     elsif date_of_vaccination.blank?
       errors.add(date_of_vaccination.header, "Enter a date")
     elsif date_of_vaccination.to_date.nil?
@@ -635,14 +612,10 @@ def validate_dose_sequence
       end
     elsif administered && offline_recording? && default_dose_sequence.present?
       if field.nil?
-        if systm_one_enabled?
-          errors.add(
-            :base,
-            "<code>DOSE_SEQUENCE</code> or <code>Vaccination type</code> is required"
-          )
-        else
-          errors.add(:base, "<code>DOSE_SEQUENCE</code> is required")
-        end
+        errors.add(
+          :base,
+          "<code>DOSE_SEQUENCE</code> or <code>Vaccination type</code> is required"
+        )
       else
         errors.add(
           field.header,
@@ -663,14 +636,10 @@ def validate_existing_patients
 
   def validate_patient_date_of_birth
     if patient_date_of_birth.nil?
-      if systm_one_enabled?
-        errors.add(
-          :base,
-          "<code>PERSON_DOB</code> or <code>Date of birth</code> is required"
-        )
-      else
-        errors.add(:base, "<code>PERSON_DOB</code> is required")
-      end
+      errors.add(
+        :base,
+        "<code>PERSON_DOB</code> or <code>Date of birth</code> is required"
+      )
     elsif patient_date_of_birth.blank?
       errors.add(patient_date_of_birth.header, "Enter a date of birth.")
     elsif patient_date_of_birth.to_date.nil?
@@ -688,32 +657,21 @@ def validate_patient_date_of_birth
 
   def validate_patient_first_name
     if patient_first_name.nil?
-      if systm_one_enabled?
-        errors.add(
-          :base,
-          "<code>PERSON_FORENAME</code> or <code>First name</code> is required"
-        )
-      else
-        errors.add(:base, "<code>PERSON_FORENAME</code> is required")
-      end
+      errors.add(
+        :base,
+        "<code>PERSON_FORENAME</code> or <code>First name</code> is required"
+      )
     elsif patient_first_name.blank?
       errors.add(patient_first_name.header, "Enter a first name.")
     end
   end
 
   def validate_patient_gender_code
     if patient_gender_code.nil?
-      if systm_one_enabled?
-        errors.add(
-          :base,
-          "<code>PERSON_GENDER_CODE</code>, <code>PERSON_GENDER</code> or <code>Sex</code> is required"
-        )
-      else
-        errors.add(
-          :base,
-          "<code>PERSON_GENDER_CODE</code> or <code>PERSON_GENDER</code> is required"
-        )
-      end
+      errors.add(
+        :base,
+        "<code>PERSON_GENDER_CODE</code>, <code>PERSON_GENDER</code> or <code>Sex</code> is required"
+      )
     elsif patient_gender_code.blank?
       errors.add(patient_gender_code.header, "Enter a gender or gender code.")
     elsif patient_gender_code_value.nil?
@@ -726,14 +684,10 @@ def validate_patient_gender_code
 
   def validate_patient_last_name
     if patient_last_name.nil?
-      if systm_one_enabled?
-        errors.add(
-          :base,
-          "<code>PERSON_SURNAME</code> or <code>Surname</code> is required"
-        )
-      else
-        errors.add(:base, "<code>PERSON_SURNAME</code> is required")
-      end
+      errors.add(
+        :base,
+        "<code>PERSON_SURNAME</code> or <code>Surname</code> is required"
+      )
     elsif patient_last_name.blank?
       errors.add(patient_last_name.header, "Enter a last name.")
     end
@@ -759,14 +713,10 @@ def validate_patient_postcode
       end
     elsif patient_nhs_number_value.blank?
       if patient_postcode.nil?
-        if systm_one_enabled?
-          errors.add(
-            :base,
-            "<code>PERSON_POSTCODE</code> or <code>Postcode</code> is required"
-          )
-        else
-          errors.add(:base, "<code>PERSON_POSTCODE</code> is required")
-        end
+        errors.add(
+          :base,
+          "<code>PERSON_POSTCODE</code> or <code>Postcode</code> is required"
+        )
       else
         errors.add(
           patient_postcode.header,
@@ -834,14 +784,10 @@ def validate_programme
     field = programme_name.presence || combined_vaccination_and_dose_sequence
 
     if field.nil?
-      if systm_one_enabled?
-        errors.add(
-          :base,
-          "<code>PROGRAMME</code> or <code>Vaccination type</code> is required"
-        )
-      else
-        errors.add(:base, "<code>PROGRAMME</code> is required")
-      end
+      errors.add(
+        :base,
+        "<code>PROGRAMME</code> or <code>Vaccination type</code> is required"
+      )
     elsif field.blank?
       errors.add(field.header, "Enter a programme.")
     else
@@ -871,14 +817,10 @@ def validate_reason_not_administered
   def validate_school_name
     if school_name.blank? && school_urn&.to_s == SCHOOL_URN_UNKNOWN
       if school_name.nil?
-        if systm_one_enabled?
-          errors.add(
-            :base,
-            "<code>SCHOOL_NAME</code> or <code>School</code> is required"
-          )
-        else
-          errors.add(:base, "<code>SCHOOL_NAME</code> is required")
-        end
+        errors.add(
+          :base,
+          "<code>SCHOOL_NAME</code> or <code>School</code> is required"
+        )
       else
         errors.add(school_name.header, "Enter a school name.")
       end

app/views/immunisation_imports/new.html.erb

@@ -11,16 +11,12 @@
 
   <h1 class="nhsuk-heading-l"><%= title %></h1>
 
-  <% if Flipper.enabled?(:systm_one_import) %>
-    <p>You can import vaccination records by uploading:</p>
-
-    <ul class="nhsuk-list nhsuk-list--bullet">
-      <li>a Mavis CSV file</li>
-      <li>a SystmOne file</li>
-    </ul>
-  <% else %>
-    <p>The file you upload should use the Mavis CSV format for vaccination records.</p>
-  <% end %>
+  <p>You can import vaccination records by uploading:</p>
+
+  <ul class="nhsuk-list nhsuk-list--bullet">
+    <li>a Mavis CSV file</li>
+    <li>a SystmOne file</li>
+  </ul>
 
   <%= render AppImportFormatDetailsComponent.new(import: @immunisation_import) %>
 

config/feature_flags.yml

@@ -11,5 +11,3 @@ report_gillick_notify_parents: Include whether patients would like their
   parents to be informed of vaccinations in the reporting.
 
 school_moves_export: Allow exporting confirmed school moves.
-
-systm_one_import: Allow importing vaccination records in SystmOne format.