Move fuzzy version-matching pattern to constants

Author: jnm

kobo/apps/reports/constants.py

@@ -9,4 +9,5 @@
 DEFAULT_REPORTS_KEY = 'default'
 
 FUZZY_VERSION_ID_KEY = '_version_'
-INFERRED_VERSION_ID_KEY = '__inferred_version__'
+FUZZY_VERSION_PATTERN = r'^__?version__?(\d{3})?$'
+INFERRED_VERSION_ID_KEY = '__inferred_version__'

kpi/serializers/v2/asset.py

@@ -9,6 +9,7 @@
 from rest_framework.reverse import reverse
 from rest_framework.utils.serializer_helpers import ReturnList
 
+from kobo.apps.reports.constants import FUZZY_VERSION_PATTERN
 from kobo.apps.reports.report_data import build_formpack
 from kpi.constants import (
     ASSET_STATUS_DISCOVERABLE,
@@ -509,11 +510,10 @@ def validate_data_sharing(self, data_sharing: dict) -> dict:
                 # We do not want to include the version field.
                 # See `_infer_version_id()` in `kobo.apps.reports.report_data.build_formpack`
                 # for field name alternatives.
-                version_pattern = r'^__?version__?(\d{3})?$'
                 valid_fields = [
                     f.path for f in form_pack.get_fields_for_versions(
                         form_pack.versions.keys()
-                    ) if not re.match(version_pattern, f.path)
+                    ) if not re.match(FUZZY_VERSION_PATTERN, f.path)
                 ]
                 unknown_fields = set(fields) - set(valid_fields)
                 if unknown_fields and valid_fields:

kpi/serializers/v2/paired_data.py

@@ -6,6 +6,7 @@
 from rest_framework import serializers
 from rest_framework.reverse import reverse
 
+from kobo.apps.reports.constants import FUZZY_VERSION_PATTERN
 from kobo.apps.reports.report_data import build_formpack
 from kpi.constants import (
     ASSET_TYPE_SURVEY,
@@ -134,11 +135,10 @@ def _validate_fields(self, attrs: dict):
         # We do not want to include the version field.
         # See `_infer_version_id()` in `kobo.apps.reports.report_data.build_formpack`
         # for field name alternatives.
-        version_pattern = r'^__?version__?(\d{3})?$'
         valid_fields = [
             f.path for f in form_pack.get_fields_for_versions(
                 form_pack.versions.keys()
-            ) if not re.match(version_pattern, f.path)
+            ) if not re.match(FUZZY_VERSION_PATTERN, f.path)
         ]
 
         source_fields = source.data_sharing.get('fields') or valid_fields