Skip to content
Snippets Groups Projects
Unverified Commit cd5f679e authored by Martin Weise's avatar Martin Weise
Browse files

Fixed some metadata bugs

parent aaaa32c8
No related branches found
No related tags found
2 merge requests!81New stable release,!80Multiple features connected with user management and ownership of databases
This commit is part of merge request !81. Comments created here will be created in the context of that merge request.
Show whitespace changes
Inline Side-by-side
Showing
with 305 additions and 187 deletions
.jupyter/api_authentication/models/database_dto.py
+ 20
− 20
Edit View file @ cd5f679e
...@@ -31,7 +31,7 @@ class DatabaseDto(object): ...@@ -31,7 +31,7 @@ class DatabaseDto(object):
'id': 'int', 'id': 'int',
'name': 'str', 'name': 'str',
'exchange': 'str', 'exchange': 'str',
'creator': 'UserDto', 'creator': 'UserBriefDto',
'subjects': 'list[str]', 'subjects': 'list[str]',
'language': 'str', 'language': 'str',
'license': 'LicenseDto', 'license': 'LicenseDto',
...@@ -44,7 +44,7 @@ class DatabaseDto(object): ...@@ -44,7 +44,7 @@ class DatabaseDto(object):
'created': 'datetime', 'created': 'datetime',
'deleted': 'datetime', 'deleted': 'datetime',
'internal_name': 'str', 'internal_name': 'str',
'publication': 'str', 'publication_year': 'int',
'is_public': 'bool' 'is_public': 'bool'
} }
...@@ -65,11 +65,11 @@ class DatabaseDto(object): ...@@ -65,11 +65,11 @@ class DatabaseDto(object):
'created': 'created', 'created': 'created',
'deleted': 'deleted', 'deleted': 'deleted',
'internal_name': 'internal_name', 'internal_name': 'internal_name',
'publication': 'publication', 'publication_year': 'publication_year',
'is_public': 'is_public' 'is_public': 'is_public'
} }
def __init__(self, id=None, name=None, exchange=None, creator=None, subjects=None, language=None, license=None, description=None, publisher=None, contact=None, tables=None, image=None, container=None, created=None, deleted=None, internal_name=None, publication=None, is_public=None): # noqa: E501 def __init__(self, id=None, name=None, exchange=None, creator=None, subjects=None, language=None, license=None, description=None, publisher=None, contact=None, tables=None, image=None, container=None, created=None, deleted=None, internal_name=None, publication_year=None, is_public=None): # noqa: E501
"""DatabaseDto - a model defined in Swagger""" # noqa: E501 """DatabaseDto - a model defined in Swagger""" # noqa: E501
self._id = None self._id = None
self._name = None self._name = None
...@@ -87,7 +87,7 @@ class DatabaseDto(object): ...@@ -87,7 +87,7 @@ class DatabaseDto(object):
self._created = None self._created = None
self._deleted = None self._deleted = None
self._internal_name = None self._internal_name = None
self._publication = None self._publication_year = None
self._is_public = None self._is_public = None
self.discriminator = None self.discriminator = None
self.id = id self.id = id
...@@ -117,8 +117,8 @@ class DatabaseDto(object): ...@@ -117,8 +117,8 @@ class DatabaseDto(object):
if deleted is not None: if deleted is not None:
self.deleted = deleted self.deleted = deleted
self.internal_name = internal_name self.internal_name = internal_name
if publication is not None: if publication_year is not None:
self.publication = publication self.publication_year = publication_year
if is_public is not None: if is_public is not None:
self.is_public = is_public self.is_public = is_public
...@@ -197,7 +197,7 @@ class DatabaseDto(object): ...@@ -197,7 +197,7 @@ class DatabaseDto(object):
:return: The creator of this DatabaseDto. # noqa: E501 :return: The creator of this DatabaseDto. # noqa: E501
:rtype: UserDto :rtype: UserBriefDto
""" """
return self._creator return self._creator
...@@ -207,7 +207,7 @@ class DatabaseDto(object): ...@@ -207,7 +207,7 @@ class DatabaseDto(object):
:param creator: The creator of this DatabaseDto. # noqa: E501 :param creator: The creator of this DatabaseDto. # noqa: E501
:type: UserDto :type: UserBriefDto
""" """
if creator is None: if creator is None:
raise ValueError("Invalid value for `creator`, must not be `None`") # noqa: E501 raise ValueError("Invalid value for `creator`, must not be `None`") # noqa: E501
...@@ -475,25 +475,25 @@ class DatabaseDto(object): ...@@ -475,25 +475,25 @@ class DatabaseDto(object):
self._internal_name = internal_name self._internal_name = internal_name
@property @property
def publication(self): def publication_year(self):
"""Gets the publication of this DatabaseDto. # noqa: E501 """Gets the publication_year of this DatabaseDto. # noqa: E501
:return: The publication of this DatabaseDto. # noqa: E501 :return: The publication_year of this DatabaseDto. # noqa: E501
:rtype: str :rtype: int
""" """
return self._publication return self._publication_year
@publication.setter @publication_year.setter
def publication(self, publication): def publication_year(self, publication_year):
"""Sets the publication of this DatabaseDto. """Sets the publication_year of this DatabaseDto.
:param publication: The publication of this DatabaseDto. # noqa: E501 :param publication_year: The publication_year of this DatabaseDto. # noqa: E501
:type: str :type: int
""" """
self._publication = publication self._publication_year = publication_year
@property @property
def is_public(self): def is_public(self):
......
.jupyter/api_container/models/database_dto.py
+ 20
− 20
Edit View file @ cd5f679e
...@@ -31,7 +31,7 @@ class DatabaseDto(object): ...@@ -31,7 +31,7 @@ class DatabaseDto(object):
'id': 'int', 'id': 'int',
'name': 'str', 'name': 'str',
'exchange': 'str', 'exchange': 'str',
'creator': 'UserDto', 'creator': 'UserBriefDto',
'subjects': 'list[str]', 'subjects': 'list[str]',
'language': 'str', 'language': 'str',
'license': 'LicenseDto', 'license': 'LicenseDto',
...@@ -44,7 +44,7 @@ class DatabaseDto(object): ...@@ -44,7 +44,7 @@ class DatabaseDto(object):
'created': 'datetime', 'created': 'datetime',
'deleted': 'datetime', 'deleted': 'datetime',
'internal_name': 'str', 'internal_name': 'str',
'publication': 'str', 'publication_year': 'int',
'is_public': 'bool' 'is_public': 'bool'
} }
...@@ -65,11 +65,11 @@ class DatabaseDto(object): ...@@ -65,11 +65,11 @@ class DatabaseDto(object):
'created': 'created', 'created': 'created',
'deleted': 'deleted', 'deleted': 'deleted',
'internal_name': 'internal_name', 'internal_name': 'internal_name',
'publication': 'publication', 'publication_year': 'publication_year',
'is_public': 'is_public' 'is_public': 'is_public'
} }
def __init__(self, id=None, name=None, exchange=None, creator=None, subjects=None, language=None, license=None, description=None, publisher=None, contact=None, tables=None, image=None, container=None, created=None, deleted=None, internal_name=None, publication=None, is_public=None): # noqa: E501 def __init__(self, id=None, name=None, exchange=None, creator=None, subjects=None, language=None, license=None, description=None, publisher=None, contact=None, tables=None, image=None, container=None, created=None, deleted=None, internal_name=None, publication_year=None, is_public=None): # noqa: E501
"""DatabaseDto - a model defined in Swagger""" # noqa: E501 """DatabaseDto - a model defined in Swagger""" # noqa: E501
self._id = None self._id = None
self._name = None self._name = None
...@@ -87,7 +87,7 @@ class DatabaseDto(object): ...@@ -87,7 +87,7 @@ class DatabaseDto(object):
self._created = None self._created = None
self._deleted = None self._deleted = None
self._internal_name = None self._internal_name = None
self._publication = None self._publication_year = None
self._is_public = None self._is_public = None
self.discriminator = None self.discriminator = None
self.id = id self.id = id
...@@ -117,8 +117,8 @@ class DatabaseDto(object): ...@@ -117,8 +117,8 @@ class DatabaseDto(object):
if deleted is not None: if deleted is not None:
self.deleted = deleted self.deleted = deleted
self.internal_name = internal_name self.internal_name = internal_name
if publication is not None: if publication_year is not None:
self.publication = publication self.publication_year = publication_year
if is_public is not None: if is_public is not None:
self.is_public = is_public self.is_public = is_public
...@@ -197,7 +197,7 @@ class DatabaseDto(object): ...@@ -197,7 +197,7 @@ class DatabaseDto(object):
:return: The creator of this DatabaseDto. # noqa: E501 :return: The creator of this DatabaseDto. # noqa: E501
:rtype: UserDto :rtype: UserBriefDto
""" """
return self._creator return self._creator
...@@ -207,7 +207,7 @@ class DatabaseDto(object): ...@@ -207,7 +207,7 @@ class DatabaseDto(object):
:param creator: The creator of this DatabaseDto. # noqa: E501 :param creator: The creator of this DatabaseDto. # noqa: E501
:type: UserDto :type: UserBriefDto
""" """
if creator is None: if creator is None:
raise ValueError("Invalid value for `creator`, must not be `None`") # noqa: E501 raise ValueError("Invalid value for `creator`, must not be `None`") # noqa: E501
...@@ -475,25 +475,25 @@ class DatabaseDto(object): ...@@ -475,25 +475,25 @@ class DatabaseDto(object):
self._internal_name = internal_name self._internal_name = internal_name
@property @property
def publication(self): def publication_year(self):
"""Gets the publication of this DatabaseDto. # noqa: E501 """Gets the publication_year of this DatabaseDto. # noqa: E501
:return: The publication of this DatabaseDto. # noqa: E501 :return: The publication_year of this DatabaseDto. # noqa: E501
:rtype: str :rtype: int
""" """
return self._publication return self._publication_year
@publication.setter @publication_year.setter
def publication(self, publication): def publication_year(self, publication_year):
"""Sets the publication of this DatabaseDto. """Sets the publication_year of this DatabaseDto.
:param publication: The publication of this DatabaseDto. # noqa: E501 :param publication_year: The publication_year of this DatabaseDto. # noqa: E501
:type: str :type: int
""" """
self._publication = publication self._publication_year = publication_year
@property @property
def is_public(self): def is_public(self):
......
.jupyter/api_database/models/database_dto.py
+ 20
− 20
Edit View file @ cd5f679e
...@@ -31,7 +31,7 @@ class DatabaseDto(object): ...@@ -31,7 +31,7 @@ class DatabaseDto(object):
'id': 'int', 'id': 'int',
'name': 'str', 'name': 'str',
'exchange': 'str', 'exchange': 'str',
'creator': 'UserDto', 'creator': 'UserBriefDto',
'subjects': 'list[str]', 'subjects': 'list[str]',
'language': 'str', 'language': 'str',
'license': 'LicenseDto', 'license': 'LicenseDto',
...@@ -44,7 +44,7 @@ class DatabaseDto(object): ...@@ -44,7 +44,7 @@ class DatabaseDto(object):
'created': 'datetime', 'created': 'datetime',
'deleted': 'datetime', 'deleted': 'datetime',
'internal_name': 'str', 'internal_name': 'str',
'publication': 'str', 'publication_year': 'int',
'is_public': 'bool' 'is_public': 'bool'
} }
...@@ -65,11 +65,11 @@ class DatabaseDto(object): ...@@ -65,11 +65,11 @@ class DatabaseDto(object):
'created': 'created', 'created': 'created',
'deleted': 'deleted', 'deleted': 'deleted',
'internal_name': 'internal_name', 'internal_name': 'internal_name',
'publication': 'publication', 'publication_year': 'publication_year',
'is_public': 'is_public' 'is_public': 'is_public'
} }
def __init__(self, id=None, name=None, exchange=None, creator=None, subjects=None, language=None, license=None, description=None, publisher=None, contact=None, tables=None, image=None, container=None, created=None, deleted=None, internal_name=None, publication=None, is_public=None): # noqa: E501 def __init__(self, id=None, name=None, exchange=None, creator=None, subjects=None, language=None, license=None, description=None, publisher=None, contact=None, tables=None, image=None, container=None, created=None, deleted=None, internal_name=None, publication_year=None, is_public=None): # noqa: E501
"""DatabaseDto - a model defined in Swagger""" # noqa: E501 """DatabaseDto - a model defined in Swagger""" # noqa: E501
self._id = None self._id = None
self._name = None self._name = None
...@@ -87,7 +87,7 @@ class DatabaseDto(object): ...@@ -87,7 +87,7 @@ class DatabaseDto(object):
self._created = None self._created = None
self._deleted = None self._deleted = None
self._internal_name = None self._internal_name = None
self._publication = None self._publication_year = None
self._is_public = None self._is_public = None
self.discriminator = None self.discriminator = None
self.id = id self.id = id
...@@ -117,8 +117,8 @@ class DatabaseDto(object): ...@@ -117,8 +117,8 @@ class DatabaseDto(object):
if deleted is not None: if deleted is not None:
self.deleted = deleted self.deleted = deleted
self.internal_name = internal_name self.internal_name = internal_name
if publication is not None: if publication_year is not None:
self.publication = publication self.publication_year = publication_year
if is_public is not None: if is_public is not None:
self.is_public = is_public self.is_public = is_public
...@@ -197,7 +197,7 @@ class DatabaseDto(object): ...@@ -197,7 +197,7 @@ class DatabaseDto(object):
:return: The creator of this DatabaseDto. # noqa: E501 :return: The creator of this DatabaseDto. # noqa: E501
:rtype: UserDto :rtype: UserBriefDto
""" """
return self._creator return self._creator
...@@ -207,7 +207,7 @@ class DatabaseDto(object): ...@@ -207,7 +207,7 @@ class DatabaseDto(object):
:param creator: The creator of this DatabaseDto. # noqa: E501 :param creator: The creator of this DatabaseDto. # noqa: E501
:type: UserDto :type: UserBriefDto
""" """
if creator is None: if creator is None:
raise ValueError("Invalid value for `creator`, must not be `None`") # noqa: E501 raise ValueError("Invalid value for `creator`, must not be `None`") # noqa: E501
...@@ -475,25 +475,25 @@ class DatabaseDto(object): ...@@ -475,25 +475,25 @@ class DatabaseDto(object):
self._internal_name = internal_name self._internal_name = internal_name
@property @property
def publication(self): def publication_year(self):
"""Gets the publication of this DatabaseDto. # noqa: E501 """Gets the publication_year of this DatabaseDto. # noqa: E501
:return: The publication of this DatabaseDto. # noqa: E501 :return: The publication_year of this DatabaseDto. # noqa: E501
:rtype: str :rtype: int
""" """
return self._publication return self._publication_year
@publication.setter @publication_year.setter
def publication(self, publication): def publication_year(self, publication_year):
"""Sets the publication of this DatabaseDto. """Sets the publication_year of this DatabaseDto.
:param publication: The publication of this DatabaseDto. # noqa: E501 :param publication_year: The publication_year of this DatabaseDto. # noqa: E501
:type: str :type: int
""" """
self._publication = publication self._publication_year = publication_year
@property @property
def is_public(self): def is_public(self):
......
.jupyter/api_database/models/database_modify_dto.py
+ 18
− 18
Edit View file @ cd5f679e
...@@ -34,7 +34,7 @@ class DatabaseModifyDto(object): ...@@ -34,7 +34,7 @@ class DatabaseModifyDto(object):
'license': 'LicenseDto', 'license': 'LicenseDto',
'language': 'str', 'language': 'str',
'is_public': 'bool', 'is_public': 'bool',
'publication': 'str', 'publication_year': 'int',
'contact_person': 'str' 'contact_person': 'str'
} }
...@@ -45,11 +45,11 @@ class DatabaseModifyDto(object): ...@@ -45,11 +45,11 @@ class DatabaseModifyDto(object):
'license': 'license', 'license': 'license',
'language': 'language', 'language': 'language',
'is_public': 'is_public', 'is_public': 'is_public',
'publication': 'publication', 'publication_year': 'publication_year',
'contact_person': 'contact_person' 'contact_person': 'contact_person'
} }
def __init__(self, subject=None, description=None, publisher=None, license=None, language=None, is_public=None, publication=None, contact_person=None): # noqa: E501 def __init__(self, subject=None, description=None, publisher=None, license=None, language=None, is_public=None, publication_year=None, contact_person=None): # noqa: E501
"""DatabaseModifyDto - a model defined in Swagger""" # noqa: E501 """DatabaseModifyDto - a model defined in Swagger""" # noqa: E501
self._subject = None self._subject = None
self._description = None self._description = None
...@@ -57,7 +57,7 @@ class DatabaseModifyDto(object): ...@@ -57,7 +57,7 @@ class DatabaseModifyDto(object):
self._license = None self._license = None
self._language = None self._language = None
self._is_public = None self._is_public = None
self._publication = None self._publication_year = None
self._contact_person = None self._contact_person = None
self.discriminator = None self.discriminator = None
if subject is not None: if subject is not None:
...@@ -70,7 +70,7 @@ class DatabaseModifyDto(object): ...@@ -70,7 +70,7 @@ class DatabaseModifyDto(object):
if language is not None: if language is not None:
self.language = language self.language = language
self.is_public = is_public self.is_public = is_public
self.publication = publication self.publication_year = publication_year
if contact_person is not None: if contact_person is not None:
self.contact_person = contact_person self.contact_person = contact_person
...@@ -211,27 +211,27 @@ class DatabaseModifyDto(object): ...@@ -211,27 +211,27 @@ class DatabaseModifyDto(object):
self._is_public = is_public self._is_public = is_public
@property @property
def publication(self): def publication_year(self):
"""Gets the publication of this DatabaseModifyDto. # noqa: E501 """Gets the publication_year of this DatabaseModifyDto. # noqa: E501
:return: The publication of this DatabaseModifyDto. # noqa: E501 :return: The publication_year of this DatabaseModifyDto. # noqa: E501
:rtype: str :rtype: int
""" """
return self._publication return self._publication_year
@publication.setter @publication_year.setter
def publication(self, publication): def publication_year(self, publication_year):
"""Sets the publication of this DatabaseModifyDto. """Sets the publication_year of this DatabaseModifyDto.
:param publication: The publication of this DatabaseModifyDto. # noqa: E501 :param publication_year: The publication_year of this DatabaseModifyDto. # noqa: E501
:type: str :type: int
""" """
if publication is None: if publication_year is None:
raise ValueError("Invalid value for `publication`, must not be `None`") # noqa: E501 raise ValueError("Invalid value for `publication_year`, must not be `None`") # noqa: E501
self._publication = publication self._publication_year = publication_year
@property @property
def contact_person(self): def contact_person(self):
......
.jupyter/api_identifier/models/identifier_dto.py
+ 70
− 18
Edit View file @ cd5f679e
...@@ -46,7 +46,9 @@ class IdentifierDto(object): ...@@ -46,7 +46,9 @@ class IdentifierDto(object):
'query_hash': 'str', 'query_hash': 'str',
'result_hash': 'str', 'result_hash': 'str',
'result_number': 'int', 'result_number': 'int',
'publication': 'str', 'publication_day': 'int',
'publication_month': 'int',
'publication_year': 'int',
'last_modified': 'datetime' 'last_modified': 'datetime'
} }
...@@ -69,11 +71,13 @@ class IdentifierDto(object): ...@@ -69,11 +71,13 @@ class IdentifierDto(object):
'query_hash': 'query_hash', 'query_hash': 'query_hash',
'result_hash': 'result_hash', 'result_hash': 'result_hash',
'result_number': 'result_number', 'result_number': 'result_number',
'publication': 'publication', 'publication_day': 'publication_day',
'publication_month': 'publication_month',
'publication_year': 'publication_year',
'last_modified': 'last_modified' 'last_modified': 'last_modified'
} }
def __init__(self, id=None, cid=None, dbid=None, qid=None, title=None, description=None, query=None, execution=None, visibility=None, doi=None, creator=None, creators=None, created=None, query_normalized=None, related=None, query_hash=None, result_hash=None, result_number=None, publication=None, last_modified=None): # noqa: E501 def __init__(self, id=None, cid=None, dbid=None, qid=None, title=None, description=None, query=None, execution=None, visibility=None, doi=None, creator=None, creators=None, created=None, query_normalized=None, related=None, query_hash=None, result_hash=None, result_number=None, publication_day=None, publication_month=None, publication_year=None, last_modified=None): # noqa: E501
"""IdentifierDto - a model defined in Swagger""" # noqa: E501 """IdentifierDto - a model defined in Swagger""" # noqa: E501
self._id = None self._id = None
self._cid = None self._cid = None
...@@ -93,7 +97,9 @@ class IdentifierDto(object): ...@@ -93,7 +97,9 @@ class IdentifierDto(object):
self._query_hash = None self._query_hash = None
self._result_hash = None self._result_hash = None
self._result_number = None self._result_number = None
self._publication = None self._publication_day = None
self._publication_month = None
self._publication_year = None
self._last_modified = None self._last_modified = None
self.discriminator = None self.discriminator = None
if id is not None: if id is not None:
...@@ -118,7 +124,11 @@ class IdentifierDto(object): ...@@ -118,7 +124,11 @@ class IdentifierDto(object):
self.query_hash = query_hash self.query_hash = query_hash
self.result_hash = result_hash self.result_hash = result_hash
self.result_number = result_number self.result_number = result_number
self.publication = publication if publication_day is not None:
self.publication_day = publication_day
if publication_month is not None:
self.publication_month = publication_month
self.publication_year = publication_year
if last_modified is not None: if last_modified is not None:
self.last_modified = last_modified self.last_modified = last_modified
...@@ -535,27 +545,69 @@ class IdentifierDto(object): ...@@ -535,27 +545,69 @@ class IdentifierDto(object):
self._result_number = result_number self._result_number = result_number
@property @property
def publication(self): def publication_day(self):
"""Gets the publication of this IdentifierDto. # noqa: E501 """Gets the publication_day of this IdentifierDto. # noqa: E501
:return: The publication of this IdentifierDto. # noqa: E501 :return: The publication_day of this IdentifierDto. # noqa: E501
:rtype: str :rtype: int
""" """
return self._publication return self._publication_day
@publication.setter @publication_day.setter
def publication(self, publication): def publication_day(self, publication_day):
"""Sets the publication of this IdentifierDto. """Sets the publication_day of this IdentifierDto.
:param publication: The publication of this IdentifierDto. # noqa: E501 :param publication_day: The publication_day of this IdentifierDto. # noqa: E501
:type: str :type: int
"""
self._publication_day = publication_day
@property
def publication_month(self):
"""Gets the publication_month of this IdentifierDto. # noqa: E501
:return: The publication_month of this IdentifierDto. # noqa: E501
:rtype: int
"""
return self._publication_month
@publication_month.setter
def publication_month(self, publication_month):
"""Sets the publication_month of this IdentifierDto.
:param publication_month: The publication_month of this IdentifierDto. # noqa: E501
:type: int
"""
self._publication_month = publication_month
@property
def publication_year(self):
"""Gets the publication_year of this IdentifierDto. # noqa: E501
:return: The publication_year of this IdentifierDto. # noqa: E501
:rtype: int
"""
return self._publication_year
@publication_year.setter
def publication_year(self, publication_year):
"""Sets the publication_year of this IdentifierDto.
:param publication_year: The publication_year of this IdentifierDto. # noqa: E501
:type: int
""" """
if publication is None: if publication_year is None:
raise ValueError("Invalid value for `publication`, must not be `None`") # noqa: E501 raise ValueError("Invalid value for `publication_year`, must not be `None`") # noqa: E501
self._publication = publication self._publication_year = publication_year
@property @property
def last_modified(self): def last_modified(self):
......
.jupyter/api_query/api/table_data_endpoint_api.py
+ 2
− 2
Edit View file @ cd5f679e
...@@ -259,7 +259,7 @@ class TableDataEndpointApi(object): ...@@ -259,7 +259,7 @@ class TableDataEndpointApi(object):
auth_settings = ['bearerAuth'] # noqa: E501 auth_settings = ['bearerAuth'] # noqa: E501
return self.api_client.call_api( return self.api_client.call_api(
'/api/container/{id}/database/{databaseId}/table/{tableId}/data', 'HEAD', '/api/container/{id}/database/{databaseId}/table/{tableId}/data', 'GET',
path_params, path_params,
query_params, query_params,
header_params, header_params,
...@@ -380,7 +380,7 @@ class TableDataEndpointApi(object): ...@@ -380,7 +380,7 @@ class TableDataEndpointApi(object):
auth_settings = ['bearerAuth'] # noqa: E501 auth_settings = ['bearerAuth'] # noqa: E501
return self.api_client.call_api( return self.api_client.call_api(
'/api/container/{id}/database/{databaseId}/table/{tableId}/data', 'GET', '/api/container/{id}/database/{databaseId}/table/{tableId}/data', 'HEAD',
path_params, path_params,
query_params, query_params,
header_params, header_params,
......
.jupyter/api_query/models/database_dto.py
+ 20
− 20
Edit View file @ cd5f679e
...@@ -31,7 +31,7 @@ class DatabaseDto(object): ...@@ -31,7 +31,7 @@ class DatabaseDto(object):
'id': 'int', 'id': 'int',
'name': 'str', 'name': 'str',
'exchange': 'str', 'exchange': 'str',
'creator': 'UserDto', 'creator': 'UserBriefDto',
'subjects': 'list[str]', 'subjects': 'list[str]',
'language': 'str', 'language': 'str',
'license': 'LicenseDto', 'license': 'LicenseDto',
...@@ -44,7 +44,7 @@ class DatabaseDto(object): ...@@ -44,7 +44,7 @@ class DatabaseDto(object):
'created': 'datetime', 'created': 'datetime',
'deleted': 'datetime', 'deleted': 'datetime',
'internal_name': 'str', 'internal_name': 'str',
'publication': 'str', 'publication_year': 'int',
'is_public': 'bool' 'is_public': 'bool'
} }
...@@ -65,11 +65,11 @@ class DatabaseDto(object): ...@@ -65,11 +65,11 @@ class DatabaseDto(object):
'created': 'created', 'created': 'created',
'deleted': 'deleted', 'deleted': 'deleted',
'internal_name': 'internal_name', 'internal_name': 'internal_name',
'publication': 'publication', 'publication_year': 'publication_year',
'is_public': 'is_public' 'is_public': 'is_public'
} }
def __init__(self, id=None, name=None, exchange=None, creator=None, subjects=None, language=None, license=None, description=None, publisher=None, contact=None, tables=None, image=None, container=None, created=None, deleted=None, internal_name=None, publication=None, is_public=None): # noqa: E501 def __init__(self, id=None, name=None, exchange=None, creator=None, subjects=None, language=None, license=None, description=None, publisher=None, contact=None, tables=None, image=None, container=None, created=None, deleted=None, internal_name=None, publication_year=None, is_public=None): # noqa: E501
"""DatabaseDto - a model defined in Swagger""" # noqa: E501 """DatabaseDto - a model defined in Swagger""" # noqa: E501
self._id = None self._id = None
self._name = None self._name = None
...@@ -87,7 +87,7 @@ class DatabaseDto(object): ...@@ -87,7 +87,7 @@ class DatabaseDto(object):
self._created = None self._created = None
self._deleted = None self._deleted = None
self._internal_name = None self._internal_name = None
self._publication = None self._publication_year = None
self._is_public = None self._is_public = None
self.discriminator = None self.discriminator = None
self.id = id self.id = id
...@@ -117,8 +117,8 @@ class DatabaseDto(object): ...@@ -117,8 +117,8 @@ class DatabaseDto(object):
if deleted is not None: if deleted is not None:
self.deleted = deleted self.deleted = deleted
self.internal_name = internal_name self.internal_name = internal_name
if publication is not None: if publication_year is not None:
self.publication = publication self.publication_year = publication_year
if is_public is not None: if is_public is not None:
self.is_public = is_public self.is_public = is_public
...@@ -197,7 +197,7 @@ class DatabaseDto(object): ...@@ -197,7 +197,7 @@ class DatabaseDto(object):
:return: The creator of this DatabaseDto. # noqa: E501 :return: The creator of this DatabaseDto. # noqa: E501
:rtype: UserDto :rtype: UserBriefDto
""" """
return self._creator return self._creator
...@@ -207,7 +207,7 @@ class DatabaseDto(object): ...@@ -207,7 +207,7 @@ class DatabaseDto(object):
:param creator: The creator of this DatabaseDto. # noqa: E501 :param creator: The creator of this DatabaseDto. # noqa: E501
:type: UserDto :type: UserBriefDto
""" """
if creator is None: if creator is None:
raise ValueError("Invalid value for `creator`, must not be `None`") # noqa: E501 raise ValueError("Invalid value for `creator`, must not be `None`") # noqa: E501
...@@ -475,25 +475,25 @@ class DatabaseDto(object): ...@@ -475,25 +475,25 @@ class DatabaseDto(object):
self._internal_name = internal_name self._internal_name = internal_name
@property @property
def publication(self): def publication_year(self):
"""Gets the publication of this DatabaseDto. # noqa: E501 """Gets the publication_year of this DatabaseDto. # noqa: E501
:return: The publication of this DatabaseDto. # noqa: E501 :return: The publication_year of this DatabaseDto. # noqa: E501
:rtype: str :rtype: int
""" """
return self._publication return self._publication_year
@publication.setter @publication_year.setter
def publication(self, publication): def publication_year(self, publication_year):
"""Sets the publication of this DatabaseDto. """Sets the publication_year of this DatabaseDto.
:param publication: The publication of this DatabaseDto. # noqa: E501 :param publication_year: The publication_year of this DatabaseDto. # noqa: E501
:type: str :type: int
""" """
self._publication = publication self._publication_year = publication_year
@property @property
def is_public(self): def is_public(self):
......
.jupyter/api_table/models/table_dto.py
+ 28
− 1
Edit View file @ cd5f679e
...@@ -30,6 +30,7 @@ class TableDto(object): ...@@ -30,6 +30,7 @@ class TableDto(object):
swagger_types = { swagger_types = {
'id': 'int', 'id': 'int',
'name': 'str', 'name': 'str',
'creator': 'UserBriefDto',
'topic': 'str', 'topic': 'str',
'description': 'str', 'description': 'str',
'created': 'datetime', 'created': 'datetime',
...@@ -40,6 +41,7 @@ class TableDto(object): ...@@ -40,6 +41,7 @@ class TableDto(object):
attribute_map = { attribute_map = {
'id': 'id', 'id': 'id',
'name': 'name', 'name': 'name',
'creator': 'creator',
'topic': 'topic', 'topic': 'topic',
'description': 'description', 'description': 'description',
'created': 'created', 'created': 'created',
...@@ -47,10 +49,11 @@ class TableDto(object): ...@@ -47,10 +49,11 @@ class TableDto(object):
'internal_name': 'internal_name' 'internal_name': 'internal_name'
} }
def __init__(self, id=None, name=None, topic=None, description=None, created=None, columns=None, internal_name=None): # noqa: E501 def __init__(self, id=None, name=None, creator=None, topic=None, description=None, created=None, columns=None, internal_name=None): # noqa: E501
"""TableDto - a model defined in Swagger""" # noqa: E501 """TableDto - a model defined in Swagger""" # noqa: E501
self._id = None self._id = None
self._name = None self._name = None
self._creator = None
self._topic = None self._topic = None
self._description = None self._description = None
self._created = None self._created = None
...@@ -59,6 +62,7 @@ class TableDto(object): ...@@ -59,6 +62,7 @@ class TableDto(object):
self.discriminator = None self.discriminator = None
self.id = id self.id = id
self.name = name self.name = name
self.creator = creator
self.topic = topic self.topic = topic
self.description = description self.description = description
if created is not None: if created is not None:
...@@ -112,6 +116,29 @@ class TableDto(object): ...@@ -112,6 +116,29 @@ class TableDto(object):
self._name = name self._name = name
@property
def creator(self):
"""Gets the creator of this TableDto. # noqa: E501
:return: The creator of this TableDto. # noqa: E501
:rtype: UserBriefDto
"""
return self._creator
@creator.setter
def creator(self, creator):
"""Sets the creator of this TableDto.
:param creator: The creator of this TableDto. # noqa: E501
:type: UserBriefDto
"""
if creator is None:
raise ValueError("Invalid value for `creator`, must not be `None`") # noqa: E501
self._creator = creator
@property @property
def topic(self): def topic(self):
"""Gets the topic of this TableDto. # noqa: E501 """Gets the topic of this TableDto. # noqa: E501
......
.jupyter/load_test.py
+ 5
− 2
Edit View file @ cd5f679e
...@@ -5,6 +5,7 @@ import os ...@@ -5,6 +5,7 @@ import os
import shutil import shutil
import uuid import uuid
from postgres import Postgres from postgres import Postgres
from datetime import date
import api_query.rest import api_query.rest
from api_authentication.api.authentication_endpoint_api import AuthenticationEndpointApi from api_authentication.api.authentication_endpoint_api import AuthenticationEndpointApi
...@@ -98,7 +99,7 @@ def update_database(container_id, database_id, is_public=True): ...@@ -98,7 +99,7 @@ def update_database(container_id, database_id, is_public=True):
}, },
"language": "en", "language": "en",
"is_public": is_public, "is_public": is_public,
"publication": "2022-07-19" "publication_year": date.year
}, container_id, database_id) }, container_id, database_id)
print("updated database with id %d" % response.id) print("updated database with id %d" % response.id)
return response return response
...@@ -203,7 +204,9 @@ def create_identifier(container_id, database_id, query_id, visibility="everyone" ...@@ -203,7 +204,9 @@ def create_identifier(container_id, database_id, query_id, visibility="everyone"
"affiliation": "TU Wien", "affiliation": "TU Wien",
"orcid": "0000-0002-9272-6225" "orcid": "0000-0002-9272-6225"
}], }],
"publication": "2022-07-16", "publication_day": date.day,
"publication_month": date.month,
"publication_year": date.year,
"related_identifiers": [{ "related_identifiers": [{
"value": "http://localhost:3000/container/" + str(container_id) + "/database/" + str(database_id), "value": "http://localhost:3000/container/" + str(container_id) + "/database/" + str(database_id),
"type": "URL", "type": "URL",
......
fda-database-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java
+ 2
− 1
Edit View file @ cd5f679e
...@@ -104,6 +104,7 @@ public abstract class BaseUnitTest { ...@@ -104,6 +104,7 @@ public abstract class BaseUnitTest {
public final static String DATABASE_1_NAME = "Weather"; public final static String DATABASE_1_NAME = "Weather";
public final static String DATABASE_1_DESCRIPTION = "Weather somewhere in the world"; public final static String DATABASE_1_DESCRIPTION = "Weather somewhere in the world";
public final static String DATABASE_1_PUBLISHER = "TU Wien"; public final static String DATABASE_1_PUBLISHER = "TU Wien";
public final static Short DATABASE_1_PUBLICATION_YEAR = 2022;
public final static Boolean DATABASE_1_PUBLIC = false; public final static Boolean DATABASE_1_PUBLIC = false;
public final static String DATABASE_1_INTERNALNAME = "weather"; public final static String DATABASE_1_INTERNALNAME = "weather";
public final static String DATABASE_1_EXCHANGE = "fda." + DATABASE_1_INTERNALNAME; public final static String DATABASE_1_EXCHANGE = "fda." + DATABASE_1_INTERNALNAME;
...@@ -127,7 +128,7 @@ public abstract class BaseUnitTest { ...@@ -127,7 +128,7 @@ public abstract class BaseUnitTest {
.description(DATABASE_1_DESCRIPTION) .description(DATABASE_1_DESCRIPTION)
.language(LanguageTypeDto.EN) .language(LanguageTypeDto.EN)
.license(LICENSE_1_DTO) .license(LICENSE_1_DTO)
.publication("2022-08-01") .publicationYear(DATABASE_1_PUBLICATION_YEAR)
.publisher(DATABASE_1_PUBLISHER) .publisher(DATABASE_1_PUBLISHER)
.build(); .build();
......
fda-database-service/services/src/main/java/at/tuwien/service/impl/MariaDbServiceImpl.java
+ 1
− 1
Edit View file @ cd5f679e
...@@ -201,7 +201,7 @@ public class MariaDbServiceImpl extends HibernateConnector implements DatabaseSe ...@@ -201,7 +201,7 @@ public class MariaDbServiceImpl extends HibernateConnector implements DatabaseSe
database.setIsPublic(modifyDto.getIsPublic()); database.setIsPublic(modifyDto.getIsPublic());
database.setDescription(modifyDto.getDescription()); database.setDescription(modifyDto.getDescription());
database.setPublisher(modifyDto.getPublisher()); database.setPublisher(modifyDto.getPublisher());
database.setPublication(modifyDto.getPublication()); database.setPublicationYear(modifyDto.getPublicationYear());
database.setLanguage(databaseMapper.languageTypeDtoToLanguageType(modifyDto.getLanguage())); database.setLanguage(databaseMapper.languageTypeDtoToLanguageType(modifyDto.getLanguage()));
final Database dbdb = databaseRepository.save(database); final Database dbdb = databaseRepository.save(database);
......
fda-identifier-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java
+ 12
− 6
Edit View file @ cd5f679e
...@@ -246,7 +246,7 @@ public abstract class BaseUnitTest { ...@@ -246,7 +246,7 @@ public abstract class BaseUnitTest {
public final static Instant IDENTIFIER_1_CREATED = Instant.ofEpochSecond(1641588352); public final static Instant IDENTIFIER_1_CREATED = Instant.ofEpochSecond(1641588352);
public final static Instant IDENTIFIER_1_MODIFIED = Instant.ofEpochSecond(1541588352); public final static Instant IDENTIFIER_1_MODIFIED = Instant.ofEpochSecond(1541588352);
public final static Instant IDENTIFIER_1_EXECUTION = Instant.ofEpochSecond(1541588352); public final static Instant IDENTIFIER_1_EXECUTION = Instant.ofEpochSecond(1541588352);
public final static String IDENTIFIER_1_PUBLICATION_YEAR = "2022-07-14"; public final static Short IDENTIFIER_1_PUBLICATION_YEAR = 2022;
public final static String IDENTIFIER_1_QUERY_HASH = "abc"; public final static String IDENTIFIER_1_QUERY_HASH = "abc";
public final static String IDENTIFIER_1_RESULT_HASH = "def"; public final static String IDENTIFIER_1_RESULT_HASH = "def";
public final static String IDENTIFIER_1_QUERY = "SELECT `id` FROM `foobar`"; public final static String IDENTIFIER_1_QUERY = "SELECT `id` FROM `foobar`";
...@@ -264,7 +264,9 @@ public abstract class BaseUnitTest { ...@@ -264,7 +264,9 @@ public abstract class BaseUnitTest {
public final static Instant IDENTIFIER_2_CREATED = Instant.ofEpochSecond(1641588352); public final static Instant IDENTIFIER_2_CREATED = Instant.ofEpochSecond(1641588352);
public final static Instant IDENTIFIER_2_MODIFIED = Instant.ofEpochSecond(1541588352); public final static Instant IDENTIFIER_2_MODIFIED = Instant.ofEpochSecond(1541588352);
public final static Instant IDENTIFIER_2_EXECUTION = Instant.ofEpochSecond(1541588352); public final static Instant IDENTIFIER_2_EXECUTION = Instant.ofEpochSecond(1541588352);
public final static String IDENTIFIER_2_PUBLICATION_YEAR = "2022-07-14"; public final static Short IDENTIFIER_2_PUBLICATION_DAY = 14;
public final static Short IDENTIFIER_2_PUBLICATION_MONTH = 7;
public final static Short IDENTIFIER_2_PUBLICATION_YEAR = 2022;
public final static String IDENTIFIER_2_QUERY_HASH = "abc"; public final static String IDENTIFIER_2_QUERY_HASH = "abc";
public final static String IDENTIFIER_2_RESULT_HASH = "def"; public final static String IDENTIFIER_2_RESULT_HASH = "def";
public final static String IDENTIFIER_2_QUERY = "SELECT `id` FROM `foobar`"; public final static String IDENTIFIER_2_QUERY = "SELECT `id` FROM `foobar`";
...@@ -284,7 +286,7 @@ public abstract class BaseUnitTest { ...@@ -284,7 +286,7 @@ public abstract class BaseUnitTest {
.created(IDENTIFIER_1_CREATED) .created(IDENTIFIER_1_CREATED)
.lastModified(IDENTIFIER_1_MODIFIED) .lastModified(IDENTIFIER_1_MODIFIED)
.execution(IDENTIFIER_1_EXECUTION) .execution(IDENTIFIER_1_EXECUTION)
.publication(IDENTIFIER_1_PUBLICATION_YEAR) .publicationYear(IDENTIFIER_1_PUBLICATION_YEAR)
.queryHash(IDENTIFIER_1_QUERY_HASH) .queryHash(IDENTIFIER_1_QUERY_HASH)
.resultHash(IDENTIFIER_1_RESULT_HASH) .resultHash(IDENTIFIER_1_RESULT_HASH)
.query(IDENTIFIER_1_QUERY) .query(IDENTIFIER_1_QUERY)
...@@ -305,7 +307,9 @@ public abstract class BaseUnitTest { ...@@ -305,7 +307,9 @@ public abstract class BaseUnitTest {
.created(IDENTIFIER_2_CREATED) .created(IDENTIFIER_2_CREATED)
.lastModified(IDENTIFIER_2_MODIFIED) .lastModified(IDENTIFIER_2_MODIFIED)
.execution(IDENTIFIER_2_EXECUTION) .execution(IDENTIFIER_2_EXECUTION)
.publication(IDENTIFIER_2_PUBLICATION_YEAR) .publicationDay(IDENTIFIER_2_PUBLICATION_DAY)
.publicationMonth(IDENTIFIER_2_PUBLICATION_MONTH)
.publicationYear(IDENTIFIER_2_PUBLICATION_YEAR)
.queryHash(IDENTIFIER_2_QUERY_HASH) .queryHash(IDENTIFIER_2_QUERY_HASH)
.resultHash(IDENTIFIER_2_RESULT_HASH) .resultHash(IDENTIFIER_2_RESULT_HASH)
.query(IDENTIFIER_2_QUERY) .query(IDENTIFIER_2_QUERY)
...@@ -404,7 +408,7 @@ public abstract class BaseUnitTest { ...@@ -404,7 +408,7 @@ public abstract class BaseUnitTest {
.title(IDENTIFIER_1_TITLE) .title(IDENTIFIER_1_TITLE)
.doi(IDENTIFIER_1_DOI) .doi(IDENTIFIER_1_DOI)
.visibility(IDENTIFIER_1_VISIBILITY_DTO) .visibility(IDENTIFIER_1_VISIBILITY_DTO)
.publication(IDENTIFIER_1_PUBLICATION_YEAR) .publicationYear(IDENTIFIER_1_PUBLICATION_YEAR)
.creators(List.of(CREATOR_1_CREATE_DTO, CREATOR_2_CREATE_DTO)) .creators(List.of(CREATOR_1_CREATE_DTO, CREATOR_2_CREATE_DTO))
.build(); .build();
...@@ -425,7 +429,9 @@ public abstract class BaseUnitTest { ...@@ -425,7 +429,9 @@ public abstract class BaseUnitTest {
.doi(IDENTIFIER_2_DOI) .doi(IDENTIFIER_2_DOI)
.visibility(IDENTIFIER_2_VISIBILITY_DTO) .visibility(IDENTIFIER_2_VISIBILITY_DTO)
.relatedIdentifiers(List.of(RELATED_IDENTIFIER_1_CREATE_DTO)) .relatedIdentifiers(List.of(RELATED_IDENTIFIER_1_CREATE_DTO))
.publication(IDENTIFIER_2_PUBLICATION_YEAR) .publicationDay(IDENTIFIER_2_PUBLICATION_DAY)
.publicationMonth(IDENTIFIER_2_PUBLICATION_MONTH)
.publicationYear(IDENTIFIER_2_PUBLICATION_YEAR)
.creators(List.of(CREATOR_1_CREATE_DTO, CREATOR_2_CREATE_DTO)) .creators(List.of(CREATOR_1_CREATE_DTO, CREATOR_2_CREATE_DTO))
.build(); .build();
......
fda-identifier-service/services/src/main/java/at/tuwien/mapper/DocumentMapper.java
+ 7
− 2
Edit View file @ cd5f679e
...@@ -34,7 +34,7 @@ public interface DocumentMapper { ...@@ -34,7 +34,7 @@ public interface DocumentMapper {
builder.append("<identifier identifierType=\"DOI\">") builder.append("<identifier identifierType=\"DOI\">")
.append(data.getDoi()) .append(data.getDoi())
.append("</identifier>"); .append("</identifier>");
if (data.getCreators().size() == 0) { if (data.getCreators().size() > 0) {
builder.append("<creators>"); builder.append("<creators>");
data.getCreators() data.getCreators()
.forEach(creator -> { .forEach(creator -> {
...@@ -57,7 +57,7 @@ public interface DocumentMapper { ...@@ -57,7 +57,7 @@ public interface DocumentMapper {
.append("<publisher xml:lang=\"en\">") .append("<publisher xml:lang=\"en\">")
.append(database.getPublisher()) .append(database.getPublisher())
.append("</publisher><publicationYear>") .append("</publisher><publicationYear>")
.append(database.getPublication()) .append(data.getPublicationYear())
.append("</publicationYear>"); .append("</publicationYear>");
if (database.getSubjects().size() > 0) { if (database.getSubjects().size() > 0) {
builder.append("<subjects>"); builder.append("<subjects>");
...@@ -107,6 +107,11 @@ public interface DocumentMapper { ...@@ -107,6 +107,11 @@ public interface DocumentMapper {
.append(database.getLicense().getUri()) .append(database.getLicense().getUri())
.append("\"/></rightsList>"); .append("\"/></rightsList>");
} }
if (data.getDescription() != null) {
builder.append("<descriptions><description descriptionType=\"Abstract\">")
.append(data.getDescription())
.append("</description></descriptions>");
}
builder.append("<version>1.0</version><descriptions>") builder.append("<version>1.0</version><descriptions>")
.append("<description xml:lang=\"en\" descriptionType=\"Abstract\">") .append("<description xml:lang=\"en\" descriptionType=\"Abstract\">")
.append(data.getDescription()) .append(data.getDescription())
......
fda-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseDto.java
+ 3
− 3
Edit View file @ cd5f679e
...@@ -64,9 +64,9 @@ public class DatabaseDto { ...@@ -64,9 +64,9 @@ public class DatabaseDto {
@Parameter(name = "database contact person") @Parameter(name = "database contact person")
private UserDto contact; private UserDto contact;
@JsonProperty("publication") @JsonProperty("publication_year")
@Parameter(name = "database publication") @Parameter(name = "database publication year")
private String publication; private Short publicationYear;
@Parameter(name = "tables") @Parameter(name = "tables")
private List<TableBriefDto> tables; private List<TableBriefDto> tables;
......
fda-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseModifyDto.java
+ 3
− 3
Edit View file @ cd5f679e
...@@ -32,9 +32,9 @@ public class DatabaseModifyDto { ...@@ -32,9 +32,9 @@ public class DatabaseModifyDto {
private String publisher; private String publisher;
@NotBlank @NotBlank
@JsonProperty("publication") @JsonProperty("publication_year")
@Parameter(name = "database publication") @Parameter(name = "database publication year")
private String publication; private Short publicationYear;
@Parameter(name = "database license") @Parameter(name = "database license")
private LicenseDto license; private LicenseDto license;
......
fda-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierCreateDto.java
+ 12
− 4
Edit View file @ cd5f679e
...@@ -39,10 +39,18 @@ public class IdentifierCreateDto { ...@@ -39,10 +39,18 @@ public class IdentifierCreateDto {
@Parameter(name = "doi", example = "Digital Object Identifier") @Parameter(name = "doi", example = "Digital Object Identifier")
private String doi; private String doi;
@NotBlank @JsonProperty("publication_day")
@JsonProperty("publication") @Parameter(name = "publication day")
@Parameter(name = "publication") private Short publicationDay;
private String publication;
@JsonProperty("publication_month")
@Parameter(name = "publication month")
private Short publicationMonth;
@NotNull
@JsonProperty("publication_year")
@Parameter(name = "publication year")
private Short publicationYear;
@NotNull @NotNull
@Parameter(name = "creators") @Parameter(name = "creators")
......
fda-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierDto.java
+ 12
− 4
Edit View file @ cd5f679e
...@@ -86,10 +86,18 @@ public class IdentifierDto { ...@@ -86,10 +86,18 @@ public class IdentifierDto {
@Parameter(name = "database creator") @Parameter(name = "database creator")
private UserDto creator; private UserDto creator;
@NotBlank @JsonProperty("publication_day")
@JsonProperty("publication") @Parameter(name = "publication day")
@Parameter(name = "publication") private Short publicationDay;
private String publication;
@JsonProperty("publication_month")
@Parameter(name = "publication month")
private Short publicationMonth;
@NotNull
@JsonProperty("publication_year")
@Parameter(name = "publication year")
private Short publicationYear;
@NotNull @NotNull
@Parameter(name = "creators") @Parameter(name = "creators")
......
fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java
+ 1
− 1
Edit View file @ cd5f679e
...@@ -76,7 +76,7 @@ public class Database { ...@@ -76,7 +76,7 @@ public class Database {
private String publisher; private String publisher;
@Column @Column
private String publication; private Short publicationYear;
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE) @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
@JoinColumns({ @JoinColumns({
......
fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java
+ 9
− 3
Edit View file @ cd5f679e
...@@ -78,6 +78,15 @@ public class Identifier { ...@@ -78,6 +78,15 @@ public class Identifier {
@Column(nullable = false) @Column(nullable = false)
private Long resultNumber; private Long resultNumber;
@Column(nullable = false)
private Short publicationYear;
@Column
private Short publicationMonth;
@Column
private Short publicationDay;
@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
@JoinColumns({ @JoinColumns({
@JoinColumn(name = "dbid", referencedColumnName = "id", insertable = false, updatable = false) @JoinColumn(name = "dbid", referencedColumnName = "id", insertable = false, updatable = false)
...@@ -97,9 +106,6 @@ public class Identifier { ...@@ -97,9 +106,6 @@ public class Identifier {
@Column @Column
private String doi; private String doi;
@Column(nullable = false)
private String publication;
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "identifier") @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "identifier")
private List<Creator> creators; private List<Creator> creators;
......
fda-metadata-db/setup-schema.sql
+ 40
− 38
Edit View file @ cd5f679e
...@@ -278,7 +278,7 @@ CREATE TABLE IF NOT EXISTS mdb_databases ...@@ -278,7 +278,7 @@ CREATE TABLE IF NOT EXISTS mdb_databases
internal_name character varying(255) NOT NULL, internal_name character varying(255) NOT NULL,
exchange character varying(255) NOT NULL, exchange character varying(255) NOT NULL,
subject character varying(255), subject character varying(255),
publication character varying(255), publication_year smallint,
ResourceType TEXT, ResourceType TEXT,
Description TEXT, Description TEXT,
Engine VARCHAR(20) DEFAULT 'Postgres', Engine VARCHAR(20) DEFAULT 'Postgres',
...@@ -458,7 +458,9 @@ CREATE TABLE IF NOT EXISTS mdb_identifiers ...@@ -458,7 +458,9 @@ CREATE TABLE IF NOT EXISTS mdb_identifiers
title VARCHAR(255) NOT NULL, title VARCHAR(255) NOT NULL,
description TEXT NOT NULL, description TEXT NOT NULL,
visibility VARCHAR(10) NOT NULL DEFAULT 'SELF', visibility VARCHAR(10) NOT NULL DEFAULT 'SELF',
publication varchar(255) NOT NULL, publication_year smallint NOT NULL,
publication_month smallint,
publication_day smallint,
query TEXT NOT NULL, query TEXT NOT NULL,
query_normalized TEXT NOT NULL, query_normalized TEXT NOT NULL,
query_hash VARCHAR(255) NOT NULL, query_hash VARCHAR(255) NOT NULL,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment