From 6c1a9fc4584b0bf370a7b3d27183ab15db691f62 Mon Sep 17 00:00:00 2001
From: jwilson232 <joe.wilson@opendataservices.coop>
Date: Tue, 11 Aug 2026 15:14:06 +0100
Subject: [PATCH 1/2] cove: ensures missing fields validation shows row ref

A bug in the way that validation errors where
being grouped meant that the 'First 3 examples'
did not render properly. The logic to render the
row ref has been updated to show for error counts
greater than or equal to one.
---
 cove/cove_360/templates/cove_360/validation_table.html | 2 +-
 lib360dataquality/cove/threesixtygiving.py             | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cove/cove_360/templates/cove_360/validation_table.html b/cove/cove_360/templates/cove_360/validation_table.html
index b5036ec..0980708 100644
--- a/cove/cove_360/templates/cove_360/validation_table.html
+++ b/cove/cove_360/templates/cove_360/validation_table.html
@@ -39,7 +39,7 @@ <h4>{{ error.schema_title }}</h4>
   </td>
   <td style="text-align: center">
     {{error_extra.values|length}} <br />
-    {% if error_extra.values|length > 3 %}
+    {% if error_extra.values|length >= 1 %}
       {% if error_prefix %}
       <button class="button button--small" data-toggle="modal" data-target-class="{{"validation-errors-"|concat:error_prefix|concat:forloop.counter}}">
       {% else %}
diff --git a/lib360dataquality/cove/threesixtygiving.py b/lib360dataquality/cove/threesixtygiving.py
index 2068eae..802d77f 100644
--- a/lib360dataquality/cove/threesixtygiving.py
+++ b/lib360dataquality/cove/threesixtygiving.py
@@ -74,7 +74,8 @@ def oneOf_draft4(validator, oneOf, instance, schema):
             required_field_1 = list(required_fields_1)[0]
             required_field_2 = list(required_fields_2)[0]
             if type(instance) is dict and required_field_1 in instance and required_field_2 in instance:
-                err = ValidationError(f"Only 1 of {required_field_1} or {required_field_2} is permitted, but both are present")
+                err = ValidationError(
+                    f"Only 1 of {required_field_1} or {required_field_2} is permitted, but both are present")
                 err.error_id = "oneOf_each_required"
                 err.extras = [required_field_1, required_field_2]
                 yield err
@@ -246,7 +247,7 @@ def group_validation_errors(validation_errors, file_type, openpyxl_workbook):
             "spreadsheet_style_errors_table": spreadsheet_style_errors_table(
                 values, openpyxl_workbook
             )
-            if (file_type in ["xlsx", "csv"] and "grants/" in error["path_no_number"])
+            if (file_type in ["xlsx", "csv"] and "grants" in error["path_no_number"])
             else None,
         }
         if error["validator"] == "required":
@@ -2108,7 +2109,8 @@ def run_extra_checks(json_data, cell_source_map, test_classes, aggregates):
                     for location in test_instance.json_locations
                 ]
             except KeyError:
-                logger.warning(f"{test_instance} - Spreadsheet location couldn't be defined {test_instance.json_locations}")
+                logger.warning(
+                    f"{test_instance} - Spreadsheet location couldn't be defined {test_instance.json_locations}")
                 pass
         results.append(
             (

From 0f9ad849b9418eb72977ad180432699743be68d9 Mon Sep 17 00:00:00 2001
From: jwilson232 <joe.wilson@opendataservices.coop>
Date: Fri, 28 Aug 2026 16:01:14 +0100
Subject: [PATCH 2/2] tests: add test cases for group validation errors

---
 cove/cove_360/tests/tests.py | 83 ++++++++++++++++++++++++++++++------
 1 file changed, 71 insertions(+), 12 deletions(-)

diff --git a/cove/cove_360/tests/tests.py b/cove/cove_360/tests/tests.py
index 15e8262..a171525 100644
--- a/cove/cove_360/tests/tests.py
+++ b/cove/cove_360/tests/tests.py
@@ -1,4 +1,5 @@
 import os
+import json
 from datetime import datetime
 from django.urls import reverse_lazy
 
@@ -8,7 +9,7 @@
 from django.core.files.base import ContentFile
 from django.core.files.uploadedfile import UploadedFile
 
-from lib360dataquality.cove.threesixtygiving import get_grants_aggregates, run_extra_checks, extend_numbers, spreadsheet_style_errors_table, TEST_CLASSES
+from lib360dataquality.cove.threesixtygiving import get_grants_aggregates, run_extra_checks, extend_numbers, spreadsheet_style_errors_table, TEST_CLASSES, group_validation_errors
 from lib360dataquality.additional_test import TestCategories, TestImportance
 
 # Source is cove_360/fixtures/fundingproviders-grants_fixed_2_grants.json
@@ -174,8 +175,8 @@
     'grants/0/plannedDates/0': [['grants', 2]],
     'grants/0/plannedDates/0/startDate': [['grants',
                                           '',
-                                          2,
-                                          'Planned Dates:Start Date']],
+                                           2,
+                                           'Planned Dates:Start Date']],
     'grants/0/plannedDates/0/endDate': [['grants',
                                          '',
                                          2,
@@ -322,8 +323,8 @@
     'grants/2/plannedDates/0': [['grants', 4]],
     'grants/2/plannedDates/0/startDate': [['grants',
                                           '',
-                                          4,
-                                          'Planned Dates:Start Date']],
+                                           4,
+                                           'Planned Dates:Start Date']],
     'grants/2/plannedDates/0/endDate': [['grants',
                                          '',
                                          4,
@@ -668,13 +669,13 @@
     ),
     (
         {
-             "category": TestCategories.ORGANISATIONS,
-             "count": 1,
-             "heading": "1 grant has introduced an additional Funding Org:Name for an existing Funding Org:Identifier",
-             "importance": 0,
-             "message": "Your data contains an organisation identifier with more than one funder name. Funding organisations are expected to have one name with a corresponding identifier, so please check your data to see why multiple funder names have occurred.",
-             "percentage": 1 / TOTAL_GRANTS,
-             "type": "MultiFundingNamesForOrgId",
+            "category": TestCategories.ORGANISATIONS,
+            "count": 1,
+            "heading": "1 grant has introduced an additional Funding Org:Name for an existing Funding Org:Identifier",
+            "importance": 0,
+            "message": "Your data contains an organisation identifier with more than one funder name. Funding organisations are expected to have one name with a corresponding identifier, so please check your data to see why multiple funder names have occurred.",
+            "percentage": 1 / TOTAL_GRANTS,
+            "type": "MultiFundingNamesForOrgId",
         },
         ["grants/1/fundingOrganization/2/name"],
         [],
@@ -1309,3 +1310,61 @@ def test_array_too_short_single(self, openpyxl_workbook):
                 ['', '???']
             ]
         }
+
+
+class TestGroupValidationErrors():
+    def _required_error(self, path_no_number, header):
+        return json.dumps({
+            "message": f"'{header}' is missing but required",
+            "validator": "required",
+            "assumption": "recipientOrganization",
+            "validator_value": None,
+            "message_type": "required",
+            "path_no_number": path_no_number,
+            "header": header,
+            "header_extra": "grants/[number]",
+            "null_clause": "",
+            "error_id": None,
+            "exclusiveMinimum": None,
+            "exclusiveMaximum": None,
+            "extras": None,
+            "each": None,
+            "property": None,
+            "reprs": None,
+        })
+
+    def test_row_ref_shown_for_top_level_grant_field(self):
+        values = [{'sheet': 'grants', 'row_number': 5, 'col_alpha': 'C', 'value': ''}]
+        validation_errors = [(self._required_error('grants', 'Amount Awarded'), values)]
+
+        grouped = group_validation_errors(validation_errors, 'xlsx', None)
+
+        error_table = grouped['required'][0][1]['spreadsheet_style_errors_table']
+        assert error_table == spreadsheet_style_errors_table(values, None)
+
+    def test_row_ref_shown_for_nested_grant_field(self):
+        values = [{'sheet': 'grants', 'row_number': 5, 'col_alpha': 'F', 'value': ''}]
+        validation_errors = [
+            (self._required_error('grants/fundingOrganization', 'Funding Org:Identifier'), values)
+        ]
+
+        grouped = group_validation_errors(validation_errors, 'xlsx', None)
+
+        error_table = grouped['required'][0][1]['spreadsheet_style_errors_table']
+        assert error_table == spreadsheet_style_errors_table(values, None)
+
+    def test_row_ref_not_shown_for_non_grant_field(self):
+        values = [{'sheet': 'other', 'row_number': 2, 'col_alpha': 'B', 'value': ''}]
+        validation_errors = [(self._required_error('other', 'Some Field'), values)]
+
+        grouped = group_validation_errors(validation_errors, 'xlsx', None)
+
+        assert grouped['required'][0][1]['spreadsheet_style_errors_table'] is None
+
+    def test_row_ref_not_shown_for_json_file_type(self):
+        values = [{'sheet': 'grants', 'row_number': 5, 'col_alpha': 'C', 'value': ''}]
+        validation_errors = [(self._required_error('grants', 'Amount Awarded'), values)]
+
+        grouped = group_validation_errors(validation_errors, 'json', None)
+
+        assert grouped['required'][0][1]['spreadsheet_style_errors_table'] is None