Merge pull request #621 from trade-tariff/HOTT-2989-xi-additional-codes

HOTT-2989: Fixes issue with source of additional code
trade-tariff · Apr 6, 2023 · 669def6 · 669def6
2 parents 3424363 + 755d75e
commit 669def6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/models/api/commodity.rb b/app/models/api/commodity.rb
@@ -103,7 +103,7 @@ def additional_code_measures
         answer = if measure.measure_type.excise?
                    "X#{user_session.excise_additional_code_for(measure.measure_type.id)}"
                  else
-                   user_session.additional_code_for(measure.measure_type.id)
+                   user_session.additional_code_for(measure.measure_type.id, source)
                  end
 
         code = measure.additional_code.presence&.code || 'none'

diff --git a/spec/models/api/commodity_spec.rb b/spec/models/api/commodity_spec.rb
@@ -142,12 +142,12 @@
     end
 
     context 'when there are additional code answers on the session' do
-      let(:commodity) { build(:commodity, :with_none_additional_code_measures) }
+      let(:commodity) { build(:commodity, :with_none_additional_code_measures, source: 'xi') }
 
       let(:user_session) do
         build(
           :user_session,
-          additional_code: { 'uk' => { '103' => picked_additional_code } },
+          additional_code: { 'xi' => { '103' => picked_additional_code } },
           excise: { '306' => '419' },
         )
       end