diff --git a/app/models/waste_carriers_engine/conviction_search_result.rb b/app/models/waste_carriers_engine/conviction_search_result.rb index dc71e07cc..e437decd8 100644 --- a/app/models/waste_carriers_engine/conviction_search_result.rb +++ b/app/models/waste_carriers_engine/conviction_search_result.rb @@ -8,7 +8,7 @@ class ConvictionSearchResult embedded_in :past_registration, class_name: "WasteCarriersEngine::PastRegistration" embedded_in :key_person, class_name: "WasteCarriersEngine::KeyPerson" - field :match_result, type: String + field :match_result, type: String, default: "NO" field :matching_system, type: String field :reference, type: String field :matched_name, type: String diff --git a/app/services/waste_carriers_engine/conviction_data_service.rb b/app/services/waste_carriers_engine/conviction_data_service.rb index dfeb32de0..2bf6ef463 100644 --- a/app/services/waste_carriers_engine/conviction_data_service.rb +++ b/app/services/waste_carriers_engine/conviction_data_service.rb @@ -6,7 +6,7 @@ def run(transient_registration) @transient_registration = transient_registration check_for_matches - add_conviction_sign_off if transient_registration.declared_convictions? || matching_or_unknown_convictions? + add_conviction_sign_off(transient_registration.declared_convictions? || matching_or_unknown_convictions?) end private @@ -15,9 +15,9 @@ def check_for_matches WasteCarriersEngine::EntityMatchingService.run(@transient_registration) end - def add_conviction_sign_off + def add_conviction_sign_off(convictions_present) conviction_sign_off = ConvictionSignOff.new - conviction_sign_off.confirmed = "no" + conviction_sign_off.confirmed = "no" if convictions_present @transient_registration.conviction_sign_offs = [conviction_sign_off] end diff --git a/app/services/waste_carriers_engine/renewal_completion_service.rb b/app/services/waste_carriers_engine/renewal_completion_service.rb index f3b510897..c7693bee4 100644 --- a/app/services/waste_carriers_engine/renewal_completion_service.rb +++ b/app/services/waste_carriers_engine/renewal_completion_service.rb @@ -152,7 +152,7 @@ def copy_data_from_transient_registration renewal_attributes = SafeCopyAttributesService.run( source_instance: transient_registration, target_class: Registration, - embedded_documents: %w[addresses metaData financeDetails key_people], + embedded_documents: %w[addresses metaData financeDetails key_people conviction_search_result], attributes_to_exclude: do_not_copy_attributes ) diff --git a/spec/services/waste_carriers_engine/conviction_data_service_spec.rb b/spec/services/waste_carriers_engine/conviction_data_service_spec.rb index bf342273d..6d1d2bdfb 100644 --- a/spec/services/waste_carriers_engine/conviction_data_service_spec.rb +++ b/spec/services/waste_carriers_engine/conviction_data_service_spec.rb @@ -31,9 +31,9 @@ module WasteCarriersEngine transient_registration.key_people = [build(:key_person, :unmatched_conviction_search_result)] end - it "does not create a conviction_search_result" do + it "creates a conviction_search_result without a match" do conviction_data_service - expect(transient_registration.reload.conviction_sign_offs).not_to exist + expect(transient_registration.reload.conviction_search_result.match_result).to eq "NO" end end @@ -43,9 +43,9 @@ module WasteCarriersEngine transient_registration.key_people = [build(:key_person, :unmatched_conviction_search_result)] end - it "creates a conviction_search_result" do + it "creates a conviction_search_result with a match" do conviction_data_service - expect(transient_registration.reload.conviction_sign_offs).to exist + expect(transient_registration.reload.conviction_search_result.match_result).to eq "YES" end end