From 929aaf09dcb582b7851a49ed5fd02e3b852b0ba8 Mon Sep 17 00:00:00 2001 From: David Sikter <david.sikter@physik.hu-berlin.de> Date: Tue, 28 Sep 2021 16:25:50 +0200 Subject: [PATCH] Renamed Dataset.created -> Dataset.dataset_create_time and Dataset.modified -> Dataset.dataset_modified_time --- nomad/app/v1/routers/datasets.py | 4 ++-- nomad/app/v1/routers/entries.py | 2 +- nomad/datamodel/datamodel.py | 12 ++++++------ tests/app/v1/routers/test_datasets.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nomad/app/v1/routers/datasets.py b/nomad/app/v1/routers/datasets.py index 7699c807b0..d65e6483cb 100644 --- a/nomad/app/v1/routers/datasets.py +++ b/nomad/app/v1/routers/datasets.py @@ -218,8 +218,8 @@ async def post_datasets( dataset_id=create_uuid(), dataset_name=create.dataset_name, user_id=user.user_id, - created=now, - modified=now, + dataset_create_time=now, + dataset_modified_time=now, dataset_type=dataset_type) dataset.a_mongo.create() diff --git a/nomad/app/v1/routers/entries.py b/nomad/app/v1/routers/entries.py index e393eb8d48..e0fe16e64f 100644 --- a/nomad/app/v1/routers/entries.py +++ b/nomad/app/v1/routers/entries.py @@ -1262,7 +1262,7 @@ async def post_entry_metadata_edit( if not verify: dataset = datamodel.Dataset( dataset_id=utils.create_uuid(), user_id=user.user_id, - dataset_name=action_value, created=datetime.utcnow()) + dataset_name=action_value, dataset_create_time=datetime.utcnow()) dataset.a_mongo.create() mongo_value = dataset.dataset_id diff --git a/nomad/datamodel/datamodel.py b/nomad/datamodel/datamodel.py index 32cbbf2c55..fa0c24a4b9 100644 --- a/nomad/datamodel/datamodel.py +++ b/nomad/datamodel/datamodel.py @@ -108,7 +108,7 @@ class User(Author): last_name: The users last name affiliation: The name of the company and institutes the user identifies with affiliation_address: The address of the given affiliation - create: The time the account was created + created: The time the account was created repo_user_id: The id that was used to identify this user in the NOMAD CoE Repository is_admin: Bool that indicated, iff the user the use admin user ''' @@ -212,9 +212,9 @@ class Dataset(metainfo.MSection): full URL, e.g. "10.17172/nomad/2019.10.29-1". pid: The original NOMAD CoE Repository dataset PID. Old DOIs still reference datasets based on this id. Is not used for new datasets. - created: The date when the dataset was first created. - modified: The date when the dataset was last modified. An owned dataset can only - be extended after a DOI was assigned. A foreign dataset cannot be changed + dataset_create_time: The date when the dataset was first created. + dataset_modified_time: The date when the dataset was last modified. An owned dataset + can only be extended after a DOI was assigned. A foreign dataset cannot be changed once a DOI was assigned. dataset_type: The type determined if a dataset is owned, i.e. was created by the uploader/owner of the contained entries; or if a dataset is foreign, @@ -243,11 +243,11 @@ class Dataset(metainfo.MSection): pid = metainfo.Quantity( type=str, a_mongo=Mongo(index=True)) - created = metainfo.Quantity( + dataset_create_time = metainfo.Quantity( type=metainfo.Datetime, a_mongo=Mongo(index=True), a_elasticsearch=Elasticsearch()) - modified = metainfo.Quantity( + dataset_modified_time = metainfo.Quantity( type=metainfo.Datetime, a_mongo=Mongo(index=True), a_elasticsearch=Elasticsearch()) diff --git a/tests/app/v1/routers/test_datasets.py b/tests/app/v1/routers/test_datasets.py index 9873612b56..4630805eb9 100644 --- a/tests/app/v1/routers/test_datasets.py +++ b/tests/app/v1/routers/test_datasets.py @@ -46,7 +46,7 @@ to assert for certain aspects in the responses. @pytest.fixture(scope='function') def data(elastic, raw_files, mongo, test_user, other_test_user): def create_dataset(**kwargs): - dataset = Dataset(created=datetime.now(), modified=datetime.now(), **kwargs) + dataset = Dataset(dataset_create_time=datetime.now(), dataset_modified_time=datetime.now(), **kwargs) dataset.m_get_annotations('mongo').save() return dataset -- GitLab