Merge pull request #105 from ride90/SDBELGA-239

SDBELGA-239 Update mapping of services and products for belga newsml
superdesk · Dec 6, 2019 · ea16236 · ea16236
2 parents a8c7407 + 1ddf863
commit ea16236
Show file tree

Hide file tree

Showing 3 changed files with 399 additions and 379 deletions.
diff --git a/server/belga/publish/belga_newsml_1_2.py b/server/belga/publish/belga_newsml_1_2.py
@@ -762,21 +762,27 @@ def _format_administrative_metadata(self, newscomponent_2_level, item):
             'Property',
             {'FormalName': 'NewsObjectId', 'Value': item[GUID_FIELD]}
         )
-        property_newspackage = SubElement(
-            administrative_metadata, 'Property',
-            {'FormalName': 'NewsPackage'}
-        )
+
         for subject in item.get('subject', []):
-            if subject.get('scheme') == 'news_services':
+            if subject.get('scheme') == 'services-products':
+                try:
+                    news_service_value, news_product_value = subject.get('qcode').split('/')
+                except ValueError:
+                    # ignore
+                    continue
+                property_newspackage = SubElement(
+                    administrative_metadata, 'Property',
+                    {'FormalName': 'NewsPackage'}
+                )
                 SubElement(
                     property_newspackage, 'Property',
-                    {'FormalName': 'NewsService', 'Value': subject['qcode']}
+                    {'FormalName': 'NewsService', 'Value': news_service_value}
                 )
-            elif subject.get('scheme') == 'news_products':
                 SubElement(
                     property_newspackage, 'Property',
-                    {'FormalName': 'NewsProduct', 'Value': subject['qcode']}
+                    {'FormalName': 'NewsProduct', 'Value': news_product_value}
                 )
+
         if 'source' in item:
             SubElement(
                 SubElement(administrative_metadata, 'Source'),