Merge pull request #41 from hydroshare/rdf_test

add review_started and published as HSTERMS

hsmodels/schemas/enums.py

@@ -87,7 +87,8 @@ class DateType(TermEnum):
     created = str(DCTERMS.created)
     valid = str(DCTERMS.valid)
     available = str(DCTERMS.available)
-    published = str(DCTERMS.published)
+    review_started = str(HSTERMS.reviewStarted)
+    published = str(HSTERMS.published)
 
 
 class ModelProgramFileType(TermEnum):

hsmodels/schemas/rdf/root_validators.py

@@ -112,6 +112,10 @@ def parse_rdf_dates(cls, values):
     dates.append({"type": DateType.modified, "value": values["modified"]})
     del values["modified"]
 
+    if "review_started" in values and values["review_started"]:
+        dates.append({"type": DateType.review_started, "value": values["review_started"]})
+        del values["review_started"]
+
     if "published" in values and values["published"]:
         dates.append({"type": DateType.published, "value": values["published"]})
         del values["published"]

hsmodels/schemas/resource.py

@@ -36,7 +36,7 @@ class Config:
         title = 'Resource Metadata'
 
         schema_config = {
-            'read_only': ['type', 'identifier', 'created', 'modified', 'published', 'url'],
+            'read_only': ['type', 'identifier', 'created', 'modified', 'review_started', 'published', 'url'],
             'dictionary_field': ['additional_metadata'],
         }
 
@@ -134,6 +134,12 @@ class BaseResourceMetadata(ResourceMetadataIn):
         description="A datetime object containing the instant associated with when a resource was last modified",
         allow_mutation=False,
     )
+    review_started: datetime = Field(
+        default=None,
+        title="Review started date",
+        description="A datetime object containing the instant associated with when metadata review started on a resource",
+        allow_mutation=False,
+    )
     published: datetime = Field(
         default=None,
         title="Published date",

hsmodels/schemas/root_validators.py

@@ -9,6 +9,8 @@ def split_dates(cls, values):
                 values["created"] = date['value']
             elif date['type'] == DateType.modified:
                 values["modified"] = date['value']
+            elif date['type'] == DateType.review_started:
+                values["review_started"] = date['value']
             elif date['type'] == DateType.published:
                 values["published"] = date['value']
         del values["dates"]

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name='hsmodels',
-    version='0.5.4',
+    version='0.5.5',
     packages=find_packages(include=['hsmodels', 'hsmodels.*', 'hsmodels.schemas.*', 'hsmodels.schemas.rdf.*'],
                            exclude=("tests",)),
     install_requires=[

tests/data/metadata/resourcemetadata.xml

@@ -169,9 +169,14 @@
       </rdf:Description>
     </hsterms:extendedMetadata>
     <dc:date>
-      <dcterms:published>
+      <hsterms:reviewStarted>
+        <rdf:value>2020-11-12T18:53:19.778819+00:00</rdf:value>
+      </hsterms:reviewStarted>
+    </dc:date>
+    <dc:date>
+      <hsterms:published>
         <rdf:value>2020-11-13T18:53:19.778819+00:00</rdf:value>
-      </dcterms:published>
+      </hsterms:published>
     </dc:date>
     <dc:publisher>
       <rdf:Description>

tests/data/metadata/resourcemetadata_with_point_coverage.xml

@@ -196,9 +196,14 @@
       </rdf:Description>
     </hsterms:extendedMetadata>
     <dc:date>
-      <dcterms:published>
+      <hsterms:reviewStarted>
+        <rdf:value>2020-11-12T18:53:19.778819+00:00</rdf:value>
+      </hsterms:reviewStarted>
+    </dc:date>
+    <dc:date>
+      <hsterms:published>
         <rdf:value>2020-11-13T18:53:19.778819+00:00</rdf:value>
-      </dcterms:published>
+      </hsterms:published>
     </dc:date>
     <dc:publisher>
       <rdf:Description>

tests/test_metadata.py

@@ -125,6 +125,7 @@ def test_resource_metadata(res_md):
 
     assert res_md.modified == datetime.fromisoformat("2020-11-13T19:40:57.276064+00:00")
     assert res_md.created == datetime.fromisoformat("2020-07-09T19:12:21.354703+00:00")
+    assert res_md.review_started == datetime.fromisoformat("2020-11-12T18:53:19.778819+00:00")
     assert res_md.published == datetime.fromisoformat("2020-11-13T18:53:19.778819+00:00")
 
     assert len(res_md.awards) == 2

tests/test_schemas.py

@@ -24,8 +24,8 @@
 )
 
 read_only_fields = [
-    (ResourceMetadata, ['type', 'identifier', 'created', 'modified', 'published', 'url']),
-    (CollectionMetadata, ['type', 'identifier', 'created', 'modified', 'published', 'url']),
+    (ResourceMetadata, ['type', 'identifier', 'created', 'modified', 'review_started', 'published', 'url']),
+    (CollectionMetadata, ['type', 'identifier', 'created', 'modified', 'review_started', 'published', 'url']),
     (GeographicRasterMetadata, ['type', 'url']),
     (ModelProgramMetadata, ['type', 'url']),
     (ModelInstanceMetadata, ['type', 'url']),

tests/test_validation.py

@@ -200,6 +200,14 @@ def test_resource_modified_readonly(res_md):
         assert '"modified" has allow_mutation set to False and cannot be assigned' in str(e)
 
 
+def test_resource_review_readonly(res_md):
+    try:
+        res_md.review_started = datetime.now()
+        assert False, "Should have thrown error"
+    except TypeError as e:
+        assert '"review_started" has allow_mutation set to False and cannot be assigned' in str(e)
+
+
 def test_resource_published_readonly(res_md):
     try:
         res_md.published = datetime.now()