Merge pull request #33 from oarepo/scoped_schemas

Release 3.0.0
oarepo · Aug 30, 2021 · e3d76af · e3d76af
2 parents 004e693 + cd8a38f
commit e3d76af
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 71 deletions.
diff --git a/oarepo_communities/datamodels/communities-v1.0.0.json5 b/oarepo_communities/datamodels/communities-v1.0.0.json5
@@ -1,15 +1,17 @@
 {
   "definitions": {
-    "primaryCommunity": {
-      "type": "string",
-      "description": "Primary community ID of the record"
-    },
-    "secondaryCommunities": {
+    "oarepo:secondaryCommunities": {
       "type": "array",
       "items": {
         "type": "string",
-        "description": "List of secondary community IDs where the record is also published"
-      }
+      },
+      "description": "List of secondary community IDs where the record is also available",
+      "minItems": 1,
+      "uniqueItems": true
+    },
+    "oarepo:primaryCommunity": {
+      "type": "string",
+      "description": "Primary community ID of the record"
     }
   }
 }
diff --git a/oarepo_communities/datamodels/communities-v2.0.0.json5 b/oarepo_communities/datamodels/communities-v2.0.0.json5
diff --git a/oarepo_communities/included_mappings/v7/communities-v1.0.0.json b/oarepo_communities/included_mappings/v7/communities-v1.0.0.json
@@ -1,10 +1,10 @@
 {
   "Communities": {
     "properties": {
-      "_primary_community": {
+      "oarepo:secondaryCommunities": {
         "type": "keyword"
       },
-      "_communities": {
+      "oarepo:primaryCommunity": {
         "type": "keyword"
       }
     }

diff --git a/oarepo_communities/included_mappings/v7/communities-v2.0.0.json b/oarepo_communities/included_mappings/v7/communities-v2.0.0.json
diff --git a/oarepo_communities/jsonschemas/communities-v1.0.0.json b/oarepo_communities/jsonschemas/communities-v1.0.0.json
@@ -4,11 +4,11 @@
       "title": "OARepo Communities fields v1.0.0",
       "type": "object",
       "properties": {
-        "_primary_community": {
+        "oarepo:primaryCommunity": {
           "type": "string",
           "description": "Primary community ID of the record"
         },
-        "_communities": {
+        "oarepo:secondaryCommunities": {
           "type": "array",
           "items": {
             "type": "string",
@@ -17,7 +17,7 @@
         }
       },
       "required": [
-        "_primary_community"
+        "oarepo:primaryCommunity"
       ]
     }
   }

diff --git a/oarepo_communities/jsonschemas/communities-v2.0.0.json b/oarepo_communities/jsonschemas/communities-v2.0.0.json
diff --git a/oarepo_communities/marshmallow/__init__.py b/oarepo_communities/marshmallow/__init__.py
@@ -12,11 +12,6 @@
 
 
 class OARepoCommunitiesMixin(Schema):
-    _primary_community = SanitizedUnicode(required=True)
-    _communities = List(SanitizedUnicode, default=list)
-
-
-class OARepoCommunitiesMixinV2(Schema):
     _primary_community = SanitizedUnicode(required=True,
                                           data_key='oarepo:primaryCommunity',
                                           attribute='oarepo:primaryCommunity')

diff --git a/oarepo_communities/version.py b/oarepo_communities/version.py
@@ -11,4 +11,4 @@
 and parsed by ``setup.py``.
 """
 
-__version__ = '2.4.0'
+__version__ = '3.0.0'