Merge pull request #25 from eea/develop

Release: organisation name to provenances RestAPI endpoint

Author: avoinea

docs/HISTORY.txt

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+13.4 - (2023-08-18)
+---------------------------
+* Feature: Add **organisation** name to **@provenances** RestAPI endpoint
+  [avoinea refs #157787]
+
 13.3 - (2022-04-20)
 ---------------------------
 * Change: IMultiDataProvenance default provenances to ExternalDataSpec and Data relatedItems

eea/app/visualization/restapi/data/provenance/get.py

@@ -1,5 +1,6 @@
 """ RestAPI GET enpoints
 """
+from plone import api
 from zope.publisher.interfaces import IPublishTraverse
 from zope.interface import implementer
 from zope.interface import Interface
@@ -9,6 +10,7 @@
 from plone.restapi.interfaces import IExpandableElement
 from eea.app.visualization.interfaces import IDataProvenance
 from eea.app.visualization.interfaces import IMultiDataProvenance
+from eea.app.visualization.cache import ramcache
 from Products.CMFPlone.interfaces import IPloneSiteRoot
 
 
@@ -21,6 +23,18 @@ def __init__(self, context, request):
         self.context = context
         self.request = request
 
+    @ramcache(lambda *args: "organisations", lifetime=86400)
+    def organisations(self):
+        """ Get a mapping of organisations url to title
+        """
+        organisations = {}
+        brains = api.content.find(portal_type='Organisation')
+        for brain in brains:
+            org = brain.getObject()
+            url = getattr(org, 'organisationUrl', '')
+            organisations[url] = brain.Title
+        return organisations
+
     def __call__(self, expand=False):
         result = {"provenances": {
             "@id": "{}/@provenances".format(self.context.absolute_url()),
@@ -32,13 +46,16 @@ def __call__(self, expand=False):
         if IPloneSiteRoot.providedBy(self.context):
             return result
 
+        organisations = self.organisations()
         result['provenances']['items'] = []
 
         # Get IMultiDataProvenance
         multi = queryAdapter(self.context, IMultiDataProvenance)
         if multi:
-            provenances = json_compatible(multi.provenances)
-            result['provenances']['items'].extend(provenances)
+            for provenance in multi.provenances:
+                owner = provenance.get('owner', '')
+                provenance['organisation'] = organisations.get(owner, '')
+                result['provenances']['items'].append(json_compatible(provenance))
 
         source = queryAdapter(self.context, IDataProvenance)
         if (getattr(source, 'link', None) and
@@ -47,7 +64,8 @@ def __call__(self, expand=False):
             provenance = {
                 "title": json_compatible(source.title),
                 "owner": json_compatible(source.owner),
-                "link": json_compatible(source.link)
+                "link": json_compatible(source.link),
+                "organisation": json_compatible(organisations.get(source.owner, ''))
             }
 
             if getattr(source, "copyrights", None):

eea/app/visualization/version.txt

@@ -1 +1 @@
-13.3
+13.4