data model: fix server error during the provisionActivity formatting.

* Fixes server error for documents search REST API with two data statement in provisionActivity. * Updates dependencies. Co-Authored-by: Johnny Mariéthoz <[email protected]>
rero · Jun 5, 2024 · 889103c · 889103c
1 parent 4b8d09c
commit 889103c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/sonar/modules/documents/utils.py b/sonar/modules/documents/utils.py
@@ -38,7 +38,11 @@ def publication_statement_text(provision_activity):
     if 'statement' not in provision_activity:
         return format_date(provision_activity['startDate'])
 
-    punctuation = {'bf:Place': ' ; ', 'bf:Agent': ', '}
+    punctuation = {
+        'bf:Place': ' ; ',
+        'bf:Agent': ', ',
+        'Date': ', '
+    }
 
     statement_with_language = {'default': ''}
     statement_type = None
@@ -49,8 +53,7 @@ def publication_statement_text(provision_activity):
         for label in labels:
             language = label.get('language', 'default')
 
-            if not statement_with_language.get(language):
-                statement_with_language[language] = ''
+            statement_with_language.setdefault(language, '')
 
             if statement_with_language[language]:
                 if statement_type == statement['type']:

diff --git a/tests/ui/documents/test_documents_utils.py b/tests/ui/documents/test_documents_utils.py
@@ -43,9 +43,15 @@ def test_publication_statement_text():
                 "value": "1798-1799"
             }],
             "type": "Date"
+        },
+        {
+            "label": [{
+                "value": "1900-1999"
+            }],
+            "type": "Date"
         }]
     }) == {
-        'default': 'Lausanne : Bulletin officiel du Directoire, 1798-1799'
+        'default': 'Lausanne : Bulletin officiel du Directoire, 1798-1799, 1900-1999'
     }
 
     # Without statement