Add list order insensitive validation mode

Apply mode to identifier, creator, date, format, subject, and temporal fields
ucldc · Dec 6, 2023 · 7d9f7e3 · 7d9f7e3
1 parent 0e03c4f
commit 7d9f7e3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/metadata_mapper/mappers/oai/cca_vault_mapper.py b/metadata_mapper/mappers/oai/cca_vault_mapper.py
@@ -2,7 +2,7 @@
 
 from .oai_mapper import OaiRecord, OaiVernacular
 from ..mapper import Validator
-from ...validator import ValidationLogLevel, ValidationMode
+from ...validator import ValidationLogLevel
 
 
 class CcaVaultRecord(OaiRecord):
@@ -60,9 +60,6 @@ def setup(self):
             }
         )
 
-        self.modify_validatable_fields("temporal", "date", "creator", "format",
-                                       validation_mode=ValidationMode.LAX)
-
     @staticmethod
     def str_match_ignore_url_protocol(validation_def: dict,
                                     rikolti_value: Any,

diff --git a/metadata_mapper/validator/validation_mode.py b/metadata_mapper/validator/validation_mode.py
@@ -37,6 +37,12 @@ class StrictMode(Mode):
         pass
 
 
+    class ListOrderInsensitiveMode(Mode):
+        @staticmethod
+        def list_compare(one: list, two: list) -> bool:
+            return sorted(one) == sorted(two)
+
+
     class LaxMode(Mode):
         """
         Lax validation mode generally permits case- and order-insensitive comparisons.
@@ -54,4 +60,5 @@ def any_compare(self, one: Any, two: Any) -> bool:
 
 
     STRICT = StrictMode()
-    LAX = LaxMode()
+    LAX = LaxMode()
+    ORDER_INSENSITIVE_IF_LIST = ListOrderInsensitiveMode()
diff --git a/metadata_mapper/validator/validator.py b/metadata_mapper/validator/validator.py
@@ -596,7 +596,8 @@ def _ensure_is_list(value: Any) -> list[Any]:
         "validations": [
                         Validator.content_match,
                         Validator.verify_type(Validator.list_of(str))
-                        ]
+                        ],
+        "validation_mode": ValidationMode.ORDER_INSENSITIVE_IF_LIST
     },
     {
         "field": "title",
@@ -665,12 +666,14 @@ def _ensure_is_list(value: Any) -> list[Any]:
     {
         "field": "creator",
         "validations": [Validator.content_match],
-        "level": ValidationLogLevel.WARNING
+        "level": ValidationLogLevel.WARNING,
+        "validation_mode": ValidationMode.ORDER_INSENSITIVE_IF_LIST
     },
     {
         "field": "date",
         "validations": [Validator.content_match],
-        "level": ValidationLogLevel.WARNING
+        "level": ValidationLogLevel.WARNING,
+        "validation_mode": ValidationMode.ORDER_INSENSITIVE_IF_LIST
     },
     {
         "field": "description",
@@ -685,7 +688,8 @@ def _ensure_is_list(value: Any) -> list[Any]:
     {
         "field": "format",
         "validations": [Validator.content_match],
-        "level": ValidationLogLevel.WARNING
+        "level": ValidationLogLevel.WARNING,
+        "validation_mode": ValidationMode.ORDER_INSENSITIVE_IF_LIST
     },
     {
         "field": "genre",
@@ -745,12 +749,14 @@ def _ensure_is_list(value: Any) -> list[Any]:
     {
         "field": "subject",
         "validations": [Validator.content_match],
-        "level": ValidationLogLevel.WARNING
+        "level": ValidationLogLevel.WARNING,
+        "validation_mode": ValidationMode.ORDER_INSENSITIVE_IF_LIST
     },
     {
         "field": "temporal",
         "validations": [Validator.content_match],
-        "level": ValidationLogLevel.WARNING
+        "level": ValidationLogLevel.WARNING,
+        "validation_mode": ValidationMode.ORDER_INSENSITIVE_IF_LIST
     },
     {
         "field": "transcription",