Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

datamodel: add non-issue fields based on zenodo/datacite #21

Merged
merged 19 commits into from
Oct 30, 2019
Merged

datamodel: add non-issue fields based on zenodo/datacite #21

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1db6be2
datamodel: add resource type
Oct 16, 2019
f3029f3
datamodel: add title and alternative title fields
Oct 25, 2019
7b089ba
tests: add publication date tests
Oct 25, 2019
c9df086
datamodel: change title type property name
Oct 25, 2019
a6a16e7
datamodel: add alternative descriptions field
Oct 25, 2019
e685bd0
datamodel: add dates, publication date and embargo date
Oct 25, 2019
2c41c24
datamodel: add language
Oct 25, 2019
17544b6
datamodel: add version
Oct 25, 2019
c5ce019
datamodel: order fields alphabetically
Oct 25, 2019
b146159
datamodel: add rights list
Oct 25, 2019
baa3549
validation: language appearances against ISO 639-3
Oct 29, 2019
798702e
validation: enums validation in marshmallow
Oct 29, 2019
a5f12e9
validation: add max length to languages
Oct 30, 2019
ce504b6
validation: refactor enum and lang from functions to attributes
Oct 30, 2019
c823d0d
models: add TODO on ObjectTypes
Oct 30, 2019
bfb975d
schema: improvements and fixes on embargo_date, recid and resource_type
Oct 30, 2019
21af85c
mappings: refactor from object to nested
Oct 30, 2019
c7895d4
jsonschema: fix description field
Oct 30, 2019
b36a12c
tests: make pass by permissions version bump
fenekku Oct 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
678 changes: 678 additions & 0 deletions invenio_rdm_records/data/objecttypes.json
View file
Open in desktop

Large diffs are not rendered by default.

219 changes: 176 additions & 43 deletions invenio_rdm_records/jsonschemas/records/record-v1.0.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,46 +24,51 @@
"access_right": {
"default": "open",
"description": "Access right for record.",
"enum": [
"open",
"embargoed",
"restricted",
"closed"
],
"type": "string"
},
"recid": {
"description": "Invenio record identifier (integer).",
"type": "number"
},
"title": {
"description": "Record title.",
"type": "string"
},
"description": {
"description": "Description/abstract for record.",
"type": "string"
},
"owners": {
"description": "List of user IDs that are owners of the record.",
"additional_descriptions": {
ppanero marked this conversation as resolved.
Show resolved Hide resolved
fenekku marked this conversation as resolved.
Show resolved Hide resolved
"type": "array",
"items": {
"type": "number"
"type": "object",
"properties": {
"description": {
"description": "Description/abstract for record.",
"type": "string"
},
"description_type": {
"description": "Type of description.",
"type": "string"
ppanero marked this conversation as resolved.
Show resolved Hide resolved
},
"lang": {
"description": "Language of the description. ISO 639-3 language code.",
"type": "string"
}
ppanero marked this conversation as resolved.
Show resolved Hide resolved
},
"required": ["description", "description_type"]
},
"type": "array",
"minItems": 1,
"uniqueItems": true
},
"keywords": {
"description": "Free text keywords.",
"additional_titles": {
fenekku marked this conversation as resolved.
Show resolved Hide resolved
"type": "array",
"items": {
"type": "string"
"type": "object",
"properties": {
"title": {
"description": "Title of the record.",
"type": "string"
},
"title_type": {
"description": "Type of title.",
"type": "string"
},
"lang": {
"description": "Language of the title. ISO 639-3 language code.",
"type": "string"
ppanero marked this conversation as resolved.
Show resolved Hide resolved
}
},
"required": ["title"]
},
"type": "array"
},
"publication_date": {
"description": "When the record is published",
"type": "string",
"format": "date-time"
"uniqueItems": true
},
"contributors": {
"description": "Contributors in order of importance.",
Expand Down Expand Up @@ -109,12 +114,7 @@
},
"role": {
"description": "",
"type": "string",
"enum": [
"ContactPerson",
"Researcher",
"Other"
]
"type": "string"
}
},
"required": [
Expand All @@ -123,19 +123,152 @@

}
},
"_created": {
"dates": {
"description": "Date interval.",
"items": {
"additionalProperties": false,
"properties": {
"description": {
"description": "Description of the date interval.",
"type": "string"
},
"end": {
"description": "End date.",
"type": "string",
"format": "date-time"
},
"start": {
"description": "Start date.",
"type": "string",
"format": "date-time"
},
"type": {
"description": "Type of the date interval."
}
},
"required": [
"type"
],
"type": "object"
},
"type": "array"
},
ppanero marked this conversation as resolved.
Show resolved Hide resolved
"description": {
"description": "Description/abstract for record.",
ppanero marked this conversation as resolved.
Show resolved Hide resolved
"type": "string"
},
"embargo_date": {
"description": "Embargo date of record (ISO8601 formatted date).",
"title": "Embargo Date",
ppanero marked this conversation as resolved.
Show resolved Hide resolved
"type": "string",
"format": "date-time"
},
"keywords": {
"description": "Free text keywords.",
"items": {
"type": "string"
},
"type": "array"
},
ppanero marked this conversation as resolved.
Show resolved Hide resolved
"language": {
"description": "Primary language of the resource. ISO 639-3 language code.",
"type": "string"
},
ppanero marked this conversation as resolved.
Show resolved Hide resolved
"owners": {
"description": "List of user IDs that are owners of the record.",
"items": {
"type": "number"
},
"type": "array",
"minItems": 1,
"uniqueItems": true
},
"publication_date": {
"description": "Record publication date (IS8601-formatted). EDTF support to be added for field.",
ppanero marked this conversation as resolved.
Show resolved Hide resolved
"type": "string",
"format": "date-time"
},
"recid": {
"description": "Invenio record identifier (integer).",
"type": "number"
ppanero marked this conversation as resolved.
Show resolved Hide resolved
},
"resource_type": {
"additionalProperties": false,
"description": "Record resource type.",
"properties": {
"openaire_subtype": {
"description": "OpenAIRE-specific resource type.",
"type": "string"
},
ppanero marked this conversation as resolved.
Show resolved Hide resolved
"subtype": {
"description": "Specific resource type.",
"type": "string"
},
"type": {
"default": "publication",
"description": "General resource type.",
"type": "string"
}
},
"required": [
"type"
ppanero marked this conversation as resolved.
Show resolved Hide resolved
],
"type": "object"
},
"rights": {
"description": "Any rights information for this resource.",
"type": "array",
"items": {
"type": "object",
"properties": {
"rights": {
"description": "The right itself. Free text.",
"type": "string"
},
"uri": {
"description": "The URI of the license.",
"type": "string",
"format": "uri"
},
"identifier": {
"description": "A short, standardized version of the license name.",
"type": "string"
},
"identifier_scheme": {
"description": "The name of the scheme.",
"type": "string"
},
"scheme_uri": {
"description": "The URI of the identifier_scheme.",
"type": "string",
"format": "uri"
},
"lang": {
"description": "Language of the right information. ISO 639-3 language code.",
"type": "string"
}
}
},
"uniqueItems": true
},
"title": {
"description": "Record title.",
"type": "string"
},
"_updated": {
"version": {
"description": "Record version tag.",
"type": "string"
}
},
"required": [
"access_right",
"_access",
"access_right",
"contributors",
"title",
"owners"
"description",
"owners",
"publication_date",
"resource_type",
"title"
]
}

Loading