udata 10.0.5.dev32808__py2.py3-none-any.whl → 10.0.5.dev32826__py2.py3-none-any.whl

udata/core/dataservices/models.py

@@ -1,7 +1,9 @@
 from datetime import datetime
 
+from blinker import Signal
 from flask import url_for
 from mongoengine import Q
+from mongoengine.signals import post_save
 
 import udata.core.contact_point.api_fields as contact_api_fields
 import udata.core.dataset.api_fields as datasets_api_fields
@@ -233,3 +235,21 @@ class Dataservice(WithMetrics, Owned, db.Document):
     def count_followers(self):
         self.metrics["followers"] = Follow.objects(until=None).followers(self).count()
         self.save()
+
+    on_create = Signal()
+    on_update = Signal()
+    on_delete = Signal()
+
+    @classmethod
+    def post_save(cls, sender, document, **kwargs):
+        if "post_save" in kwargs.get("ignores", []):
+            return
+        if kwargs.get("created"):
+            cls.on_create.send(document)
+        else:
+            cls.on_update.send(document)
+        if document.deleted_at:
+            cls.on_delete.send(document)
+
+
+post_save.connect(Dataservice.post_save, sender=Dataservice)

udata/core/metrics/commands.py

@@ -46,6 +46,7 @@ def update(
             site.count_datasets()
             site.count_resources()
             site.count_reuses()
+            site.count_dataservices()
             site.count_followers()
             site.count_discussions()
             site.count_harvesters()

udata/core/metrics/tasks.py

@@ -13,6 +13,7 @@ def compute_site_metrics(self):
     site.count_datasets()
     site.count_resources()
     site.count_reuses()
+    site.count_dataservices()
     site.count_followers()
     site.count_discussions()
     site.count_harvesters()

udata/core/organization/metrics.py

@@ -1,3 +1,4 @@
+from udata.core.dataservices.models import Dataservice
 from udata.core.owned import Owned
 from udata.models import Dataset, Organization, Reuse
 
@@ -18,6 +19,14 @@ def update_reuses_metrics(document, **kwargs):
         document.organization.count_reuses()
 
 
+@Dataservice.on_create.connect
+@Dataservice.on_update.connect
+@Dataservice.on_delete.connect
+def update_dataservices_metrics(document, **kwargs):
+    if document.organization:
+        document.organization.count_dataservices()
+
+
 @Owned.on_owner_change.connect
 def update_org_metrics(document, previous):
     if not isinstance(previous, Organization):

udata/core/organization/models.py

@@ -157,6 +157,7 @@ class Organization(WithMetrics, OrganizationBadgeMixin, db.Datetimed, db.Documen
         "datasets",
         "members",
         "reuses",
+        "dataservices",
         "followers",
         "views",
     ]
@@ -309,6 +310,12 @@ class Organization(WithMetrics, OrganizationBadgeMixin, db.Datetimed, db.Documen
         self.metrics["reuses"] = Reuse.objects(organization=self).visible().count()
         self.save()
 
+    def count_dataservices(self):
+        from udata.models import Dataservice
+
+        self.metrics["dataservices"] = Dataservice.objects(organization=self).visible().count()
+        self.save()
+
     def count_followers(self):
         from udata.models import Follow
 

udata/core/site/models.py

@@ -1,6 +1,7 @@
 from flask import current_app, g
 from werkzeug.local import LocalProxy
 
+from udata.core.dataservices.models import Dataservice
 from udata.core.dataset.models import Dataset
 from udata.core.organization.models import Organization
 from udata.core.reuse.models import Reuse
@@ -41,6 +42,7 @@ class Site(WithMetrics, db.Document):
         "public-service",
         "resources",
         "reuses",
+        "dataservices",
         "users",
         "harvesters",
     ]
@@ -87,6 +89,10 @@ class Site(WithMetrics, db.Document):
         self.metrics["reuses"] = Reuse.objects.visible().count()
         self.save()
 
+    def count_dataservices(self):
+        self.metrics["dataservices"] = Dataservice.objects.visible().count()
+        self.save()
+
     def count_followers(self):
         from udata.models import Follow
 

udata/core/user/metrics.py

@@ -1,3 +1,4 @@
+from udata.core.dataservices.models import Dataservice
 from udata.core.followers.signals import on_follow, on_unfollow
 from udata.core.owned import Owned
 from udata.models import Dataset, Reuse, User
@@ -19,6 +20,14 @@ def update_reuses_metrics(document, **kwargs):
         document.owner.count_reuses()
 
 
+@Dataservice.on_create.connect
+@Dataservice.on_update.connect
+@Dataservice.on_delete.connect
+def update_dataservices_metrics(document, **kwargs):
+    if document.owner:
+        document.owner.count_dataservices()
+
+
 @on_follow.connect
 @on_unfollow.connect
 def update_user_following_metric(follow):

udata/core/user/models.py

@@ -99,6 +99,7 @@ class User(WithMetrics, UserMixin, db.Document):
     __metrics_keys__ = [
         "datasets",
         "reuses",
+        "dataservices",
         "following",
         "followers",
     ]
@@ -296,6 +297,12 @@ class User(WithMetrics, UserMixin, db.Document):
         self.metrics["reuses"] = Reuse.objects(owner=self).visible().count()
         self.save()
 
+    def count_dataservices(self):
+        from udata.core.dataservices.models import Dataservice
+
+        self.metrics["dataservices"] = Dataservice.objects(owner=self).visible().count()
+        self.save()
+
     def count_followers(self):
         from udata.models import Follow
 

udata/tests/api/test_user_api.py

@@ -208,7 +208,13 @@ class UserAPITest(APITestCase):
             about=faker.paragraph(),
             website=faker.url(),
             avatar_url=faker.url(),
-            metrics={"datasets": 10, "followers": 1, "following": 0, "reuses": 2},
+            metrics={
+                "datasets": 10,
+                "followers": 1,
+                "following": 0,
+                "reuses": 2,
+                "dataservices": 0,
+            },
         )
         response = self.get(url_for("api.users"))
         self.assert200(response)

udata/tests/organization/test_organization_model.py

@@ -1,6 +1,8 @@
 from datetime import datetime
 
 import udata.core.organization.constants as org_constants
+from udata.core.dataservices.factories import DataserviceFactory
+from udata.core.dataservices.models import Dataservice
 from udata.core.dataset.factories import DatasetFactory, HiddenDatasetFactory
 from udata.core.followers.signals import on_follow, on_unfollow
 from udata.core.organization.factories import OrganizationFactory
@@ -27,6 +29,8 @@ class OrganizationModelTest(TestCase, DBTestMixin):
         with assert_emit(Reuse.on_create):
             reuse = VisibleReuseFactory(organization=org)
             ReuseFactory(organization=org)
+        with assert_emit(Dataservice.on_create):
+            dataservice = DataserviceFactory(organization=org)
         with assert_emit(Dataset.on_create):
             dataset = DatasetFactory(organization=org)
             HiddenDatasetFactory(organization=org)
@@ -37,11 +41,15 @@ class OrganizationModelTest(TestCase, DBTestMixin):
 
         assert org.get_metrics()["datasets"] == 1
         assert org.get_metrics()["reuses"] == 1
+        assert org.get_metrics()["dataservices"] == 1
         assert org.get_metrics()["followers"] == 1
 
         with assert_emit(Reuse.on_delete):
             reuse.deleted = datetime.utcnow()
             reuse.save()
+        with assert_emit(Dataservice.on_delete):
+            dataservice.deleted_at = datetime.utcnow()
+            dataservice.save()
         with assert_emit(Dataset.on_delete):
             dataset.deleted = datetime.utcnow()
             dataset.save()
@@ -51,6 +59,7 @@ class OrganizationModelTest(TestCase, DBTestMixin):
 
         assert org.get_metrics()["datasets"] == 0
         assert org.get_metrics()["reuses"] == 0
+        assert org.get_metrics()["dataservices"] == 0
         assert org.get_metrics()["followers"] == 0
 
     def test_organization_queryset_with_badge(self):

udata/tests/site/test_site_metrics.py

@@ -1,5 +1,6 @@
 import pytest
 
+from udata.core.dataservices.factories import DataserviceFactory
 from udata.core.dataset.factories import (
     DatasetFactory,
     HiddenDatasetFactory,
@@ -29,6 +30,14 @@ class SiteMetricTest:
 
         assert site.get_metrics()["reuses"] == 4
 
+    def test_dataservice_metric(self, app):
+        site = SiteFactory.create(id=app.config["SITE_ID"])
+        DataserviceFactory.create_batch(4)
+
+        site.count_dataservices()
+
+        assert site.get_metrics()["dataservices"] == 4
+
     def test_dataset_metric(self, app):
         site = SiteFactory.create(id=app.config["SITE_ID"])
         DatasetFactory.create_batch(2)

{udata-10.0.5.dev32808.dist-info → udata-10.0.5.dev32826.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 10.0.5.dev32808
+Version: 10.0.5.dev32826
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -142,6 +142,7 @@ It is collectively taken care of by members of the
 
 - Add dataservice csv adapter [#3208](https://github.com/opendatateam/udata/pull/3208)
 - Add url_for for dataservices and mail notifications [#3213](https://github.com/opendatateam/udata/pull/3213)
+- Compute dataservices metrics on org, user and site [#3209](https://github.com/opendatateam/udata/pull/3209)
 
 ## 10.0.4 (2024-11-29)
 

{udata-10.0.5.dev32808.dist-info → udata-10.0.5.dev32826.dist-info}/RECORD

@@ -84,7 +84,7 @@ udata/core/dataservices/api.py,sha256=LpRc1FNTA6jAOj1KsFme5TxVn4SgcUWlDBWi43H1eZ
 udata/core/dataservices/apiv2.py,sha256=XIqJq58uLtxtt52iKYo7Fl0ZXv9Sz72uA7JIGwP8Qos,995
 udata/core/dataservices/csv.py,sha256=pL3j8-_KZWJaX1xFyILXt9wBtXn9Cmov5FUQgd0lNh0,1040
 udata/core/dataservices/factories.py,sha256=LDk8vvG0zhW8J-ZX5LoJQDU13pqeIyjQ05muuMro_eA,876
-udata/core/dataservices/models.py,sha256=cDG5jBCieDwEy7nzKGwovJ9lutubPl-RYw9vwGiYh1E,8921
+udata/core/dataservices/models.py,sha256=lTcC0BqnF7bbFi1S2CZ8Qnk1Fk3TjWoHrvheFB5qSg4,9474
 udata/core/dataservices/permissions.py,sha256=98zM_R4v2ZtRubflB7ajaVQz-DVc-pZBMgtKUYy34oI,169
 udata/core/dataservices/rdf.py,sha256=9dWSqONCD5m9HmAU_ndmEmG3F1IuRUOW6MWTmk2GEEI,6792
 udata/core/dataservices/search.py,sha256=htjh3sq3tDuD2qwgRgZsW6ClrHLF6hMwYO4nfBO0Hr4,4171
@@ -135,10 +135,10 @@ udata/core/jobs/commands.py,sha256=85P5hDPdKMJzV_xbobNT8nqEW71HchPjTUJ-1u5wddE,4
 udata/core/jobs/forms.py,sha256=B-B6jXHZsYV-PWAkD8DLoOlh6trv4l1hGZ4HOPm-PD4,1495
 udata/core/jobs/models.py,sha256=xK8T3FCmhtERNbZmh1Tq_ZTO6vojM172tTc0oplNoQ0,1358
 udata/core/metrics/__init__.py,sha256=CB0MhZqNe4gKLBO-6zoGisXK7FtavxWx_Kkkle-INrc,398
-udata/core/metrics/commands.py,sha256=p9KlEcQBpjCGuU733jtEMRPxwq0yt1FLdwIYeDgAjks,5132
+udata/core/metrics/commands.py,sha256=hOaF4_kmfG_qJWnCnvEHBkhHwp5mIavVS3X5YfdF0rE,5170
 udata/core/metrics/models.py,sha256=17EDq6GnCI_splm0K_Y12vj5UKwsA6VglykjzQISp00,328
 udata/core/metrics/signals.py,sha256=9mdJW__gR2GJT3huBr6HN2SDhKYJRgNbW9dnh48cAnU,176
-udata/core/metrics/tasks.py,sha256=Z6821OgupmDCN7Hj3esdb_udZbc1Haw7YpM48ytMIs4,797
+udata/core/metrics/tasks.py,sha256=_3L2g3blndBID66s_CauXEW2bDYathjd4HAAhYNVaOs,827
 udata/core/organization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/organization/activities.py,sha256=NY9pDzOVcdo2HZ-ax77lioiDGUZ8jpUguSLt_824saQ,1133
 udata/core/organization/api.py,sha256=Z8QHV8KE53nNv56qJhUq5OLo_F6dFyzxrTT9wJ3VAPo,17927
@@ -149,8 +149,8 @@ udata/core/organization/constants.py,sha256=fncNtA-vFrRM22K1Wo6iYu9DQZjzknYxH6TI
 udata/core/organization/csv.py,sha256=j6BJvXE8_6c-IWOPOg0C-j9KiCushoG1FQxzKVBDj2A,1625
 udata/core/organization/factories.py,sha256=g8ubBcz79xbjvpunZ02IDOakFg1KE6cXjNkE9vFyFAc,624
 udata/core/organization/forms.py,sha256=tscDb1_yOpbTx3ahl8ttA7oDkX9jIyzLc4gOf6WbN3s,3552
-udata/core/organization/metrics.py,sha256=UlHOBOph9s_QW-X7dkEivVITdyZ0ku9kLKl7BmSpGTI,778
-udata/core/organization/models.py,sha256=Efv-SKxNNLtfllpi7NfL8UkBE7KDCGxfla0nK9G6whs,9144
+udata/core/organization/metrics.py,sha256=90romzr-FhnPKh-6UHBJ1Af2loDa4-8I1iZEgztA160,1062
+udata/core/organization/models.py,sha256=N6WJmH3DDVwm7kXq9Q2PbLzc_BGf1sH5zOnCCYinhms,9365
 udata/core/organization/notifications.py,sha256=i_36-l2y7fOGmnBmr5NDWmGGmrGRaCWbU-6XS4c2wQs,917
 udata/core/organization/permissions.py,sha256=GD-9TMtRppVCPaC1ysXYrONvGJV-ArzAOXm2XMKf9yo,1256
 udata/core/organization/rdf.py,sha256=TF2c85MHAu-TRiHNLxqV_Pw5z6sCgZrNszF9SYspQpk,1936
@@ -188,7 +188,7 @@ udata/core/site/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/site/api.py,sha256=OwlzjgwdrtEemw63cxc4HYEGe5n-oN0sEXCzjt22ebA,4545
 udata/core/site/factories.py,sha256=O0nLFmjrFyemzcs-YwNukq5nqd383KBGrgL5bOQsGbA,378
 udata/core/site/forms.py,sha256=avEZ4rJhibF7sKexqMlKt1qMFiUHNrmJGKjZqcAyjrc,459
-udata/core/site/models.py,sha256=PVB4I2dTQDr5p5md3faVDGZSgOcGKbloHzjzdOG96_I,6266
+udata/core/site/models.py,sha256=5Cu2MJ7N6nr7RUc0DJIUujHU0lNUCoMXC8sDThnZxZg,6477
 udata/core/site/rdf.py,sha256=HIuFNA_cvPLmib171GlRAjFZWThbESoOTbK7aj26EMc,2073
 udata/core/spam/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/spam/api.py,sha256=eqmDB4_VF5EM92675FqFmk4Be5TAnu87dmSVtgXKF4A,1740
@@ -242,8 +242,8 @@ udata/core/user/commands.py,sha256=d33hjgUi8WLA8YFvoq__FJJ_E-fk8f4tWo1iuT8jJvM,3
 udata/core/user/constants.py,sha256=aTluhTR2RGZ_cdG7-mkEoT5Ndbg8BNUwwzCOld0aLMY,77
 udata/core/user/factories.py,sha256=kkwaojciLzfuAOeRnL1E7XCcGPo8waAal_G2eeuVc0k,825
 udata/core/user/forms.py,sha256=yotqZozH9ViKuNI8SwdKocDEi7NXVs_XUMpdr_bIe5s,966
-udata/core/user/metrics.py,sha256=-3KQU3jHyVhL3kDL-gVw0dtN-8WZk4QubTfH-L9PyyI,922
-udata/core/user/models.py,sha256=-MdGdfM1aUFh3wT0DTHdQCnAdYd2VD4RvL8bVFG27mE,9951
+udata/core/user/metrics.py,sha256=ZuCxYHu-770IsO-KPMhh-ZDkl2hYSVCuHDRvp-H1NfA,1192
+udata/core/user/models.py,sha256=zpP3omla4vTWiPqFUS3ndRT8uAjNwrl_DYh82ILjiHU,10183
 udata/core/user/permissions.py,sha256=Wbd8bLqSjqp9RHJ6ffLBj74L-LECcAhWazuw4Hq-2Gk,435
 udata/core/user/rdf.py,sha256=F6SDX65ECtVOjDtHXI9WMmq33pN7HWb5ntOqe3LQsbQ,834
 udata/core/user/tasks.py,sha256=OXy6bZnr7Mld_VzhMWlNyrkhC4K57IR7H0eSjFDZucU,317
@@ -623,7 +623,7 @@ udata/tests/api/test_swagger.py,sha256=eE6La9qdTYTIUFevRVPJgtj17Jq_8uOlsDwzCNR0L
 udata/tests/api/test_tags_api.py,sha256=36zEBgthVEn6pctJ0kDgPmEaUr-iqRAHeZRcRG2LEXQ,2425
 udata/tests/api/test_topics_api.py,sha256=DfdYQ5ba3H_MKYRe4qjCYN6vaw61GccHJ4usGRIdL-4,9812
 udata/tests/api/test_transfer_api.py,sha256=5cp4-O-nxkxDibsVbsG2lZ2qAsTBX2BpoMPTm8bvT8k,3085
-udata/tests/api/test_user_api.py,sha256=hRzxFg9Y9GwFaXMZd2IZTUzK0Dk_7a4YmPsJzm2l4QM,14891
+udata/tests/api/test_user_api.py,sha256=ltJkmHPbqOSNexIWDPfJhTVZAQSafWvJtbUB9vnNdCQ,15005
 udata/tests/apiv2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/tests/apiv2/test_datasets.py,sha256=c6Keni4GWujVseem-wbvlq92yL4XHY6C1_tD7TlqXWI,20799
 udata/tests/apiv2/test_me_api.py,sha256=RAgu5iKGB3Pp8cDN-427ovly-VOz5MTL4GpPZ1NcVXI,1418
@@ -672,7 +672,7 @@ udata/tests/frontend/test_markdown.py,sha256=8E0XjByzmsY-RGdF2ESoL9Rklkfz3vcdJWK
 udata/tests/organization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/tests/organization/test_csv_adapter.py,sha256=vgTVbPMqKipcdg7wi99pHk9ZNhqtuU-yneEaVW3pZmU,1564
 udata/tests/organization/test_notifications.py,sha256=PGmME5BbYVtcPffeSE1sx47J6iAfm4RDAZIRv_MXDFE,1366
-udata/tests/organization/test_organization_model.py,sha256=clRck_ZNSIBI0VaugrInK6dUkw3yBaly6TtVqmLzfEY,3684
+udata/tests/organization/test_organization_model.py,sha256=R290hX8vQZ0ccA_cAfrSlEojeFZnnf25uFLya7lJTJc,4159
 udata/tests/organization/test_organization_rdf.py,sha256=Uf-OgXV615wLUHfcBTmp9QFuV8VCFmjI4wgvShve-mc,8074
 udata/tests/organization/test_organization_tasks.py,sha256=ehPirwfLqaEcnJ9TLk3jGw3Xh-CVx1WXhvIDFYrT2iQ,2845
 udata/tests/reuse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -684,7 +684,7 @@ udata/tests/search/test_query.py,sha256=aFZKFTJjlih5csy3eNp4MxL5hg13NqiIsrS5bCTO
 udata/tests/search/test_results.py,sha256=vHMkywoW6SQKGy5OtCriYpSo-KbVEdjVzOf8un2mjZE,2043
 udata/tests/site/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/tests/site/test_site_api.py,sha256=rVvaGFAXVy_HilxpFrifJp-ESjPd-oAfvLd5eq9kwyA,2190
-udata/tests/site/test_site_metrics.py,sha256=d0gohm0sHin5LrjBx6I9Byii-P_WDBSnkx2Bc5jjIr8,2058
+udata/tests/site/test_site_metrics.py,sha256=KxlilOUeAbBta7HwD4mB4ybDWBmRB-3UVrLunvRGoGg,2362
 udata/tests/site/test_site_model.py,sha256=zpRg5jrFPUwhGsljlO5lpCrhJLHiHYoNl28AOw5mI4c,1312
 udata/tests/site/test_site_rdf.py,sha256=zlw7leYc7azfrC6JwDjKiy3wixQzTpo-lDOm-Dg_kXw,13092
 udata/tests/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -709,9 +709,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=nGPoTSbeRlpCQGuxoJ7Oa650flpeeh
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=f-tilnngNNBEIQdXmm3GbdaLlvbwG9YLLwhqyRD5Lh4,44871
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=8RL_aEe-0QJdgY-TNMy7bS4z8X9IOK8-C076dxcp3As,28163
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=Cp0bKPeIbuAqvFeoey_9ItQbAHIeiFZPnZLa6A6JNbI,51363
-udata-10.0.5.dev32808.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-10.0.5.dev32808.dist-info/METADATA,sha256=RuoqpyAib_uJCVEasPzIGVckpLcTrU8upXi41O_LBUo,136348
-udata-10.0.5.dev32808.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-udata-10.0.5.dev32808.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-10.0.5.dev32808.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-10.0.5.dev32808.dist-info/RECORD,,
+udata-10.0.5.dev32826.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-10.0.5.dev32826.dist-info/METADATA,sha256=2288e8kvmpwyY4VeW4xjJJGF8KbIBr-V1FqJVpakkxI,136458
+udata-10.0.5.dev32826.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+udata-10.0.5.dev32826.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
+udata-10.0.5.dev32826.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-10.0.5.dev32826.dist-info/RECORD,,