From c3a017ad2214987a6b375a6acb393bddac5cfff8 Mon Sep 17 00:00:00 2001
From: William Fish <william.michael.fish@gmail.com>
Date: Wed, 17 Apr 2024 16:48:08 +0100
Subject: [PATCH] OTT-139: Code review

---
 app/lib/reporting/differences.rb              | 45 ++++++++-----------
 .../goods_nomenclature_end_date.rb            |  6 +--
 2 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/app/lib/reporting/differences.rb b/app/lib/reporting/differences.rb
index ef2293008..39b8b86ac 100644
--- a/app/lib/reporting/differences.rb
+++ b/app/lib/reporting/differences.rb
@@ -129,35 +129,28 @@ def generate(only: [])
         add_missing_from_uk_worksheet
         add_missing_from_xi_worksheet
         add_indentation_worksheet
+        add_hierarchy_worksheet
+        add_endline_worksheet
+        add_start_date_worksheet
         add_end_date_worksheet
+        add_mfn_missing_worksheet
+        add_mfn_duplicated_worksheet
+        add_misapplied_action_code_worksheet
+        add_incomplete_measure_condition_worksheet
+        add_me32_worksheet
+        add_seasonal_worksheet
+        add_omitted_duty_measures_worksheet
+        add_missing_vat_measure_worksheet
+        add_missing_quota_origins_worksheet
+        add_measure_quota_coverage_worksheet
+        add_bad_quota_association_worksheet
+        add_quota_exclusion_misalignment_worksheet
+        add_missing_supplementary_units_from_uk_worksheet
+        add_missing_supplementary_units_from_xi_worksheet
+        add_candidate_supplementary_units
+        add_me16_worksheet
         add_overview_worksheet
       ]
-      # methods = %i[
-      # add_missing_from_uk_worksheet
-      # add_missing_from_xi_worksheet
-      # add_indentation_worksheet
-      # add_hierarchy_worksheet
-      # add_endline_worksheet
-      # add_start_date_worksheet
-      # add_end_date_worksheet
-      # add_mfn_missing_worksheet
-      # add_mfn_duplicated_worksheet
-      # add_misapplied_action_code_worksheet
-      # add_incomplete_measure_condition_worksheet
-      # add_me32_worksheet
-      # add_seasonal_worksheet
-      # add_omitted_duty_measures_worksheet
-      # add_missing_vat_measure_worksheet
-      # add_missing_quota_origins_worksheet
-      # add_measure_quota_coverage_worksheet
-      # add_bad_quota_association_worksheet
-      # add_quota_exclusion_misalignment_worksheet
-      # add_missing_supplementary_units_from_uk_worksheet
-      # add_missing_supplementary_units_from_xi_worksheet
-      # add_candidate_supplementary_units
-      # add_me16_worksheet
-      # add_overview_worksheet
-      # ]
 
       methods = (methods & only) if only.any?
 
diff --git a/app/lib/reporting/differences/goods_nomenclature_end_date.rb b/app/lib/reporting/differences/goods_nomenclature_end_date.rb
index fcb2d0ff5..699df0e7a 100644
--- a/app/lib/reporting/differences/goods_nomenclature_end_date.rb
+++ b/app/lib/reporting/differences/goods_nomenclature_end_date.rb
@@ -90,12 +90,12 @@ def build_row_for(matching)
         matching_uk_goods_nomenclature_for_comparison = uk_goods_nomenclature_ids_for_comparison[matching]
         matching_xi_goods_nomenclature_for_comparison = xi_goods_nomenclature_ids_for_comparison[matching]
 
-        if matching_uk_goods_nomenclature_for_comparison.nil? || matching_xi_goods_nomenclature_for_comparison.nil?
-          new_issue = true
-        else
+        if matching_uk_goods_nomenclature_for_comparison.present? || matching_xi_goods_nomenclature_for_comparison.present?
           uk_end_date_for_comparison = matching_uk_goods_nomenclature_for_comparison['End date']&.to_date&.strftime('%d/%m/%Y')
           eu_end_date_for_comparison = matching_xi_goods_nomenclature_for_comparison['End date']&.to_date&.strftime('%d/%m/%Y')
           new_issue = uk_end_date_for_comparison == eu_end_date_for_comparison
+        else
+          new_issue = true
         end
 
         [