RST-2548 API home office number

app/controllers/api/submissions_controller.rb

@@ -40,6 +40,7 @@ def public_app_params
         :case_number,
         :form_name,
         :ni_number,
+        :ho_number,
         :date_of_birth,
         :title,
         :first_name,

app/models/online_application.rb

@@ -1,12 +1,14 @@
 class OnlineApplication < ActiveRecord::Base
   belongs_to :jurisdiction, optional: true
 
-  validates :ni_number, :date_of_birth, :first_name, :last_name, :address,
+  validates :date_of_birth, :first_name, :last_name, :address,
             :postcode, presence: true
   validates :married, :min_threshold_exceeded, :benefits, :refund, :email_contact,
             :phone_contact, :post_contact, :feedback_opt_in, inclusion: [true, false]
   validates :reference, uniqueness: true
 
+  validates :ni_number, presence: true, if: ->(app) { app.ho_number.blank? }
+
   def full_name
     [title, first_name, last_name].compact.join(' ')
   end

db/migrate/20200325104858_add_ho_number_to_online_application.rb

@@ -0,0 +1,5 @@
+class AddHoNumberToOnlineApplication < ActiveRecord::Migration[5.2]
+  def change
+    add_column :online_applications, :ho_number, :string
+  end
+end

db/migrate/20200325110607_remove_mandatory_flag_for_ni_number_from_online_application.rb

@@ -0,0 +1,5 @@
+class RemoveMandatoryFlagForNiNumberFromOnlineApplication < ActiveRecord::Migration[5.2]
+  def up
+    change_column_null :online_applications, :ni_number, :true
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_02_27_115846) do
+ActiveRecord::Schema.define(version: 2020_03_25_110607) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -26,6 +26,7 @@
     t.boolean "married"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.text "litigation_friend_details"
     t.index ["application_id"], name: "index_applicants_on_application_id"
     t.index ["first_name"], name: "index_applicants_on_first_name"
     t.index ["last_name"], name: "index_applicants_on_last_name"
@@ -260,7 +261,7 @@
     t.date "date_of_death"
     t.string "case_number"
     t.string "form_name"
-    t.string "ni_number", null: false
+    t.string "ni_number"
     t.date "date_of_birth", null: false
     t.string "title"
     t.string "first_name", null: false
@@ -287,6 +288,8 @@
     t.boolean "income_max_threshold_exceeded"
     t.string "fee_manager_firstname"
     t.string "fee_manager_lastname"
+    t.text "litigation_friend_details"
+    t.string "ho_number"
     t.index ["jurisdiction_id"], name: "index_online_applications_on_jurisdiction_id"
     t.index ["reference"], name: "index_online_applications_on_reference", unique: true
   end

features/support/env.rb

@@ -40,6 +40,7 @@
 #Define global variables
 ENV['zap_proxy'] = "localhost"
 ENV['zap_proxy_port'] = '8099'
+ENV['HOSTNAME'] = 'localhost'
 
 #Below lines are our driver profile settings to reach internet through a proxy
 #You can set security=true as environment variable or declare it on command window

spec/models/online_application_spec.rb

@@ -3,7 +3,6 @@
 RSpec.describe OnlineApplication, type: :model do
   subject(:online_application) { build :online_application }
 
-  it { is_expected.to validate_presence_of(:ni_number) }
   it { is_expected.to validate_presence_of(:date_of_birth) }
   it { is_expected.to validate_presence_of(:first_name) }
   it { is_expected.to validate_presence_of(:last_name) }
@@ -23,6 +22,32 @@
 
   it { is_expected.to validate_uniqueness_of(:reference) }
 
+  describe '#ni_number validation' do
+    context 'ho_number and ni_number is empty' do
+      before { online_application.ni_number = nil }
+
+      it { is_expected.not_to be_valid }
+    end
+
+    context 'ho_number has a value and ni_number is empty' do
+      before do
+        online_application.ni_number = nil
+        online_application.ho_number = 'L123456'
+      end
+
+      it { is_expected.to be_valid }
+    end
+
+    context 'ho_number in empty and ni_number is is valid' do
+      before do
+        online_application.ni_number = 'SN123456C'
+        online_application.ho_number = nil
+      end
+
+      it { is_expected.to be_valid }
+    end
+  end
+
   describe '#full_name' do
     subject { online_application.full_name }