Merge pull request #6056 from alphagov/fix-search-reindex-date

Zharktas · Zharktas · commit 93ef47244b01 · 2021-05-12T12:18:13.000+03:00
Catch TypeError from invalid dates thrown by dateutils
diff --git a/ckan/lib/search/index.py b/ckan/lib/search/index.py
@@ -249,7 +249,8 @@ def index_package(self, pkg_dict, defer_commit=False):
                         # The date field was empty, so dateutil filled it with
                         # the default bogus date
                         value = None
-                except (ValueError, IndexError):
+                except (IndexError, TypeError, ValueError):
+                    log.error('%r: %r value of %r is not a valid date', pkg_dict['id'], key, value)
                     continue
             new_dict[key] = value
         pkg_dict = new_dict
diff --git a/ckan/tests/lib/search/test_index.py b/ckan/tests/lib/search/test_index.py
@@ -142,6 +142,8 @@ def test_index_date_field_wrong_value(self):
                 "extras": [
                     {"key": "test_wrong_date", "value": "Not a date"},
                     {"key": "test_another_wrong_date", "value": "2014-13-01"},
+                    {"key": "test_yet_another_wrong_date", "value": "2014-15"},
+                    {"key": "test_yet_another_very_wrong_date", "value": "30/062012"},
                 ]
             }
         )
@@ -154,6 +156,8 @@ def test_index_date_field_wrong_value(self):
 
         assert "test_wrong_date" not in response.docs[0]
         assert "test_another_wrong_date" not in response.docs[0]
+        assert "test_yet_another_wrong_date" not in response.docs[0]
+        assert "test_yet_another_very_wrong_date" not in response.docs[0]
 
     def test_index_date_field_empty_value(self):
 

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,8 @@ def test_index_date_field_wrong_value(self):`
`142`	`142`	`"extras": [`
`143`	`143`	`{"key": "test_wrong_date", "value": "Not a date"},`
`144`	`144`	`{"key": "test_another_wrong_date", "value": "2014-13-01"},`
	`145`	`+ {"key": "test_yet_another_wrong_date", "value": "2014-15"},`
	`146`	`+ {"key": "test_yet_another_very_wrong_date", "value": "30/062012"},`
`145`	`147`	`]`
`146`	`148`	`}`
`147`	`149`	`)`
`@@ -154,6 +156,8 @@ def test_index_date_field_wrong_value(self):`
`154`	`156`
`155`	`157`	`assert "test_wrong_date" not in response.docs[0]`
`156`	`158`	`assert "test_another_wrong_date" not in response.docs[0]`
	`159`	`+ assert "test_yet_another_wrong_date" not in response.docs[0]`
	`160`	`+ assert "test_yet_another_very_wrong_date" not in response.docs[0]`
`157`	`161`
`158`	`162`	`def test_index_date_field_empty_value(self):`
`159`	`163`