udata 8.0.2.dev29263__py2.py3-none-any.whl → 8.0.2.dev29284__py2.py3-none-any.whl

udata/commands/purge.py

@@ -5,6 +5,7 @@ import click
 from udata.commands import cli, success
 
 from udata.core.dataset.tasks import purge_datasets
+from udata.core.dataservices.tasks import purge_dataservices
 from udata.core.organization.tasks import purge_organizations
 from udata.core.reuse.tasks import purge_reuses
 
@@ -15,13 +16,14 @@ log = logging.getLogger(__name__)
 @click.option('-d', '--datasets', is_flag=True)
 @click.option('-r', '--reuses', is_flag=True)
 @click.option('-o', '--organizations', is_flag=True)
-def purge(datasets, reuses, organizations):
+@click.option('--dataservices', is_flag=True)
+def purge(datasets, reuses, organizations, dataservices):
     '''
     Permanently remove data flagged as deleted.
 
     If no model flag is given, all models are purged.
     '''
-    purge_all = not any((datasets, reuses, organizations))
+    purge_all = not any((datasets, reuses, organizations, dataservices))
 
     if purge_all or datasets:
         log.info('Purging datasets')
@@ -35,4 +37,8 @@ def purge(datasets, reuses, organizations):
         log.info('Purging organizations')
         purge_organizations()
 
+    if purge_all or dataservices:
+        log.info('Purging dataservices')
+        purge_dataservices()
+
     success('Done')

udata/core/dataservices/api.py

@@ -6,11 +6,12 @@ import mongoengine
 from udata.api import api, API
 from udata.api_fields import patch
 from udata.core.dataset.permissions import OwnablePermission
+from udata.core.followers.api import FollowAPI
 from .models import Dataservice
-from udata.models import db
 
 ns = api.namespace('dataservices', 'Dataservices related operations (beta)')
 
+
 @ns.route('/', endpoint='dataservices')
 class DataservicesAPI(API):
     '''Dataservices collection endpoint'''
@@ -39,6 +40,7 @@ class DataservicesAPI(API):
 
         return dataservice, 201
 
+
 @ns.route('/<dataservice:dataservice>/', endpoint='dataservice')
 class DataserviceAPI(API):
     @api.doc('get_dataservice')
@@ -47,7 +49,7 @@ class DataserviceAPI(API):
         if dataservice.deleted_at and not OwnablePermission(dataservice).can():
             api.abort(410, 'Dataservice has been deleted')
         return dataservice
-    
+
     @api.secure
     @api.doc('update_dataservice', responses={400: 'Validation error'})
     @api.expect(Dataservice.__write_fields__)
@@ -75,10 +77,16 @@ class DataserviceAPI(API):
             api.abort(410, 'dataservice has been deleted')
 
         OwnablePermission(dataservice).test()
-
         dataservice.deleted_at = datetime.utcnow()
         dataservice.modified_at = datetime.utcnow()
         dataservice.save()
 
         return '', 204
 
+
+@ns.route('/<id>/followers/', endpoint='dataservice_followers')
+@ns.doc(get={'id': 'list_dataservice_followers'},
+        post={'id': 'follow_dataservice'},
+        delete={'id': 'unfollow_dataservice'})
+class DataserviceFollowersAPI(FollowAPI):
+    model = Dataservice

udata/core/dataservices/models.py

@@ -3,11 +3,11 @@ from udata.api_fields import field, function_field, generate_fields
 from udata.core.dataset.models import Dataset
 from udata.core.metrics.models import WithMetrics
 from udata.core.owned import Owned, OwnedQuerySet
-from udata.i18n import lazy_gettext as _
 import udata.core.contact_point.api_fields as contact_api_fields
 import udata.core.dataset.api_fields as datasets_api_fields
+from udata.i18n import lazy_gettext as _
 
-from udata.models import db
+from udata.models import db, Discussion, Follow
 from udata.uris import endpoint_for
 
 # "frequency"
@@ -128,3 +128,15 @@ class Dataservice(WithMetrics, Owned, db.Document):
     # temporal_coverage = db.EmbeddedDocumentField(db.DateRange)
     # spatial = db.EmbeddedDocumentField(SpatialCoverage)
     # harvest = db.EmbeddedDocumentField(HarvestDatasetMetadata)
+
+    @property
+    def is_hidden(self):
+        return self.private or self.deleted_at or self.archived_at
+
+    def count_discussions(self):
+        self.metrics['discussions'] = Discussion.objects(subject=self, closed=None).count()
+        self.save()
+
+    def count_followers(self):
+        self.metrics['followers'] = Follow.objects(until=None).followers(self).count()
+        self.save()

udata/core/dataservices/permissions.py

@@ -0,0 +1,7 @@
+from udata.core.dataset.permissions import (
+    OwnablePermission
+)
+
+class DataserviceEditPermission(OwnablePermission):
+    '''Permissions to edit a Dataservice'''
+    pass

udata/core/dataservices/tasks.py

@@ -0,0 +1,25 @@
+from celery.utils.log import get_task_logger
+
+from udata.core.dataservices.models import Dataservice
+# from udata.harvest.models import HarvestJob
+from udata.models import (Follow, Discussion, Activity, Transfer)
+from udata.tasks import job
+
+log = get_task_logger(__name__)
+
+
+@job('purge-dataservices')
+def purge_dataservices(self):
+    for dataservice in Dataservice.objects(deleted_at__ne=None):
+        log.info(f'Purging dataservice {dataservice}')
+        # Remove followers
+        Follow.objects(following=dataservice).delete()
+        # Remove discussions
+        Discussion.objects(subject=dataservice).delete()
+        # Remove HarvestItem references
+        # TODO: uncomment when adding dataservice harvest
+        # HarvestJob.objects(items__dataservice=dataservice).update(set__items__S__dataservice=None)
+        # Remove associated Transfers
+        Transfer.objects(subject=dataservice).delete()
+        # Remove dataservice
+        dataservice.delete()