Merge pull request #9530 from DFE-Digital/dy-add-other_uk_qualificati…

…on_type-to-vendor-api

Added `other_uk_qualification_type` to Vendor API

app/presenters/concerns/qualification_api_data.rb

@@ -66,6 +66,10 @@ def include_completing_qualification?
     false
   end
 
+  def exclude_completing_qualification?
+    !include_completing_qualification?
+  end
+
   def qualifications_of_level(level)
     application_form.application_qualifications.select do |qualification|
       qualification.level == level
@@ -151,12 +155,20 @@ def structured_gcse_to_hashes(gcse)
 private
 
   def completing_qualification(qualification)
-    return {} unless include_completing_qualification? && qualification.gcse?
+    return {} if exclude_completing_qualification?
+
+    return completing_gcse(qualification) if qualification.gcse?
 
     {
-      currently_completing_qualification: qualification[:currently_completing_qualification],
-      missing_explanation: qualification[:missing_explanation],
       other_uk_qualification_type: qualification[:other_uk_qualification_type],
     }
   end
+
+  def completing_gcse(gcse_qualification)
+    {
+      currently_completing_qualification: gcse_qualification[:currently_completing_qualification],
+      missing_explanation: gcse_qualification[:missing_explanation],
+      other_uk_qualification_type: gcse_qualification[:other_uk_qualification_type],
+    }
+  end
 end

spec/presenters/vendor_api/v1.4/application_presenter_spec.rb

@@ -8,10 +8,28 @@
   let(:application_form) { create(:application_form, :submitted) }
   let(:application_choice) { create(:application_choice, application_form:) }
 
-  describe '#GCSEs' do
-    subject(:gcse) { attributes[:qualifications][:gcses].first }
+  describe 'qualifications' do
+    context 'when the application has a other_uk_qualification_type qualification' do
+      subject(:other_qualification) { attributes[:qualifications][:other_qualifications].first }
+
+      before do
+        create(
+          :other_qualification,
+          other_uk_qualification_type: 'Equivalency test',
+          application_form: application_form,
+        )
+      end
+
+      it 'returns the correct other_uk_qualification_type field' do
+        expect(other_qualification[:other_uk_qualification_type]).to eq 'Equivalency test'
+        expect(other_qualification).not_to have_key(:currently_completing_qualification)
+        expect(other_qualification).not_to have_key(:missing_explanation)
+      end
+    end
+
+    context 'when the application has a missing_and_currently_completing GCSE' do
+      subject(:gcse) { attributes[:qualifications][:gcses].first }
 
-    context 'when the application has a missing_and_currently_completing qualification' do
       before do
         create(
           :gcse_qualification,