Make read_immunisation a thin wrapper around read_immunisation_by_nhs_immunisations_api_id

This reduces code duplication a lot, while maintaining the same functionality.

The only downside with this is that the error and log messages will be slightly different ("reading by ID" vs "reading record #{ID}"). Given that we only expect these functions to be run by operational staff, this doesn't seem like too much of a problem.

Author: alistair-white-horne-tng

app/lib/nhs/immunisations_api.rb

@@ -123,51 +123,8 @@ def read_immunisation_by_nhs_immunisations_api_id(nhs_immunisations_api_id)
     end
 
     def read_immunisation(vaccination_record)
-      unless Flipper.enabled?(:imms_api_integration)
-        Rails.logger.info(
-          "Not reading vaccination record from immunisations API as the" \
-            " feature flag is disabled: #{vaccination_record.id}"
-        )
-        return
-      end
-
-      if vaccination_record.nhs_immunisations_api_id.blank?
-        raise "Vaccination record #{vaccination_record.id} missing NHS Immunisation ID"
-      end
-
-      Rails.logger.info(
-        "Reading vaccination record from immunisations API:" \
-          " #{vaccination_record.id}"
-      )
-
-      nhs_id = vaccination_record.nhs_immunisations_api_id
-      response, duration =
-        execute_and_time do
-          NHS::API.connection.get(
-            "/immunisation-fhir-api/FHIR/R4/Immunization/#{nhs_id}",
-            nil,
-            { "Accept" => "application/fhir+json" }
-          )
-        end
-
-      Rails.logger.info(
-        "Read response returned with status #{response.status} in #{duration}s"
-      )
-
-      if response.status == 200
-        FHIR.from_contents(response.body.to_json)
-      else
-        raise "Error reading vaccination record #{vaccination_record.id} from" \
-                " Immunisations API: unexpected response status" \
-                " #{response.status}"
-      end
-    rescue Faraday::ClientError => e
-      if (diagnostics = extract_error_diagnostics(e&.response)).present?
-        raise "Error reading vaccination record #{vaccination_record.id} from" \
-                " Immunisations API: #{diagnostics}"
-      else
-        raise
-      end
+      nhs_immunisations_api_id = vaccination_record.nhs_immunisations_api_id
+      read_immunisation_by_nhs_immunisations_api_id(nhs_immunisations_api_id)
     end
 
     def update_immunisation(vaccination_record)

spec/lib/nhs/immunisations_api_spec.rb

@@ -428,42 +428,6 @@
     it "returns the FHIR record" do
       expect(perform_request).to be_a FHIR::Immunization
     end
-
-    context "an error is returned by the api" do
-      let(:code) { nil }
-      let(:diagnostics) { nil }
-
-      let(:body) do
-        {
-          resourceType: "OperationOutcome",
-          id: "bc2c3c82-4392-4314-9d6b-a7345f82d923",
-          meta: {
-            profile: [
-              "https://simplifier.net/guide/UKCoreDevelopment2/ProfileUKCore-OperationOutcome"
-            ]
-          },
-          issue: [
-            {
-              severity: "error",
-              code: "invalid",
-              details: {
-                coding: [
-                  {
-                    system: "https://fhir.nhs.uk/Codesystem/http-error-codes",
-                    code:
-                  }
-                ]
-              },
-              diagnostics:
-            }
-          ]
-        }.to_json
-      end
-
-      include_examples "unexpected response status", 201, "reading"
-      include_examples "client error (4XX) handling", "reading"
-      include_examples "generic error handling"
-    end
   end
 
   describe "update immunisations" do