From ec64302aa85fd39328fa3bb1984e4d34112b43d9 Mon Sep 17 00:00:00 2001 From: David Young Date: Wed, 17 Jul 2024 09:37:58 +0100 Subject: [PATCH] Refactored conditional return for `#completing_qualification` Added a `#exclude_completing_qualification?` method to improve readability --- .../concerns/qualification_api_data.rb | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/app/presenters/concerns/qualification_api_data.rb b/app/presenters/concerns/qualification_api_data.rb index ba8a1896854..123b20773e8 100644 --- a/app/presenters/concerns/qualification_api_data.rb +++ b/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,18 +155,20 @@ def structured_gcse_to_hashes(gcse) private def completing_qualification(qualification) - return {} unless include_completing_qualification? + return {} if exclude_completing_qualification? - if qualification.gcse? - return { - currently_completing_qualification: qualification[:currently_completing_qualification], - missing_explanation: qualification[:missing_explanation], - other_uk_qualification_type: qualification[:other_uk_qualification_type], - } - end + return completing_gcse(qualification) if qualification.gcse? { 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