Updated semantics service

swagger/api/api_authentication/models/token_brief_dto.py

@@ -31,7 +31,6 @@ class TokenBriefDto(object):
         'id': 'int',
         'created': 'datetime',
         'expires': 'datetime',
-        'deleted': 'datetime',
         'token_hash': 'str',
         'last_used': 'datetime'
     }
@@ -40,25 +39,21 @@ class TokenBriefDto(object):
         'id': 'id',
         'created': 'created',
         'expires': 'expires',
-        'deleted': 'deleted',
         'token_hash': 'token_hash',
         'last_used': 'last_used'
     }
 
-    def __init__(self, id=None, created=None, expires=None, deleted=None, token_hash=None, last_used=None):  # noqa: E501
+    def __init__(self, id=None, created=None, expires=None, token_hash=None, last_used=None):  # noqa: E501
         """TokenBriefDto - a model defined in Swagger"""  # noqa: E501
         self._id = None
         self._created = None
         self._expires = None
-        self._deleted = None
         self._token_hash = None
         self._last_used = None
         self.discriminator = None
         self.id = id
         self.created = created
         self.expires = expires
-        if deleted is not None:
-            self.deleted = deleted
         self.token_hash = token_hash
         if last_used is not None:
             self.last_used = last_used
@@ -132,27 +127,6 @@ class TokenBriefDto(object):
 
         self._expires = expires
 
-    @property
-    def deleted(self):
-        """Gets the deleted of this TokenBriefDto.  # noqa: E501
-
-
-        :return: The deleted of this TokenBriefDto.  # noqa: E501
-        :rtype: datetime
-        """
-        return self._deleted
-
-    @deleted.setter
-    def deleted(self, deleted):
-        """Sets the deleted of this TokenBriefDto.
-
-
-        :param deleted: The deleted of this TokenBriefDto.  # noqa: E501
-        :type: datetime
-        """
-
-        self._deleted = deleted
-
     @property
     def token_hash(self):
         """Gets the token_hash of this TokenBriefDto.  # noqa: E501

swagger/api/api_authentication/models/token_dto.py

@@ -31,7 +31,6 @@ class TokenDto(object):
         'id': 'int',
         'created': 'datetime',
         'expires': 'datetime',
-        'deleted': 'datetime',
         'token': 'str',
         'token_hash': 'str',
         'last_used': 'datetime'
@@ -41,18 +40,16 @@ class TokenDto(object):
         'id': 'id',
         'created': 'created',
         'expires': 'expires',
-        'deleted': 'deleted',
         'token': 'token',
         'token_hash': 'token_hash',
         'last_used': 'last_used'
     }
 
-    def __init__(self, id=None, created=None, expires=None, deleted=None, token=None, token_hash=None, last_used=None):  # noqa: E501
+    def __init__(self, id=None, created=None, expires=None, token=None, token_hash=None, last_used=None):  # noqa: E501
         """TokenDto - a model defined in Swagger"""  # noqa: E501
         self._id = None
         self._created = None
         self._expires = None
-        self._deleted = None
         self._token = None
         self._token_hash = None
         self._last_used = None
@@ -60,8 +57,6 @@ class TokenDto(object):
         self.id = id
         self.created = created
         self.expires = expires
-        if deleted is not None:
-            self.deleted = deleted
         self.token = token
         self.token_hash = token_hash
         if last_used is not None:
@@ -136,27 +131,6 @@ class TokenDto(object):
 
         self._expires = expires
 
-    @property
-    def deleted(self):
-        """Gets the deleted of this TokenDto.  # noqa: E501
-
-
-        :return: The deleted of this TokenDto.  # noqa: E501
-        :rtype: datetime
-        """
-        return self._deleted
-
-    @deleted.setter
-    def deleted(self, deleted):
-        """Sets the deleted of this TokenDto.
-
-
-        :param deleted: The deleted of this TokenDto.  # noqa: E501
-        :type: datetime
-        """
-
-        self._deleted = deleted
-
     @property
     def token(self):
         """Gets the token of this TokenDto.  # noqa: E501

swagger/api/api_authentication/models/user_dto.py

@@ -35,6 +35,7 @@ class UserDto(object):
         'lastname': 'str',
         'affiliation': 'str',
         'orcid': 'str',
+        'roles': 'list[str]',
         'containers': 'list[ContainerDto]',
         'databases': 'list[ContainerDto]',
         'identifiers': 'list[ContainerDto]',
@@ -53,6 +54,7 @@ class UserDto(object):
         'lastname': 'lastname',
         'affiliation': 'affiliation',
         'orcid': 'orcid',
+        'roles': 'roles',
         'containers': 'containers',
         'databases': 'databases',
         'identifiers': 'identifiers',
@@ -63,7 +65,7 @@ class UserDto(object):
         'email_verified': 'email_verified'
     }
 
-    def __init__(self, id=None, authorities=None, username=None, firstname=None, lastname=None, affiliation=None, orcid=None, containers=None, databases=None, identifiers=None, email=None, titles_before=None, titles_after=None, theme_dark=None, email_verified=None):  # noqa: E501
+    def __init__(self, id=None, authorities=None, username=None, firstname=None, lastname=None, affiliation=None, orcid=None, roles=None, containers=None, databases=None, identifiers=None, email=None, titles_before=None, titles_after=None, theme_dark=None, email_verified=None):  # noqa: E501
         """UserDto - a model defined in Swagger"""  # noqa: E501
         self._id = None
         self._authorities = None
@@ -72,6 +74,7 @@ class UserDto(object):
         self._lastname = None
         self._affiliation = None
         self._orcid = None
+        self._roles = None
         self._containers = None
         self._databases = None
         self._identifiers = None
@@ -93,6 +96,7 @@ class UserDto(object):
             self.affiliation = affiliation
         if orcid is not None:
             self.orcid = orcid
+        self.roles = roles
         if containers is not None:
             self.containers = containers
         if databases is not None:
@@ -260,6 +264,31 @@ class UserDto(object):
 
         self._orcid = orcid
 
+    @property
+    def roles(self):
+        """Gets the roles of this UserDto.  # noqa: E501
+
+        Roles of the user  # noqa: E501
+
+        :return: The roles of this UserDto.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._roles
+
+    @roles.setter
+    def roles(self, roles):
+        """Sets the roles of this UserDto.
+
+        Roles of the user  # noqa: E501
+
+        :param roles: The roles of this UserDto.  # noqa: E501
+        :type: list[str]
+        """
+        if roles is None:
+            raise ValueError("Invalid value for `roles`, must not be `None`")  # noqa: E501
+
+        self._roles = roles
+
     @property
     def containers(self):
         """Gets the containers of this UserDto.  # noqa: E501

swagger/api/api_authentication/models/user_roles_dto.py

@@ -61,6 +61,13 @@ class UserRolesDto(object):
         """
         if roles is None:
             raise ValueError("Invalid value for `roles`, must not be `None`")  # noqa: E501
+        allowed_values = ["researcher", "developer", "data_steward"]  # noqa: E501
+        if not set(roles).issubset(set(allowed_values)):
+            raise ValueError(
+                "Invalid values for `roles` [{0}], must be a subset of [{1}]"  # noqa: E501
+                .format(", ".join(map(str, set(roles) - set(allowed_values))),  # noqa: E501
+                        ", ".join(map(str, allowed_values)))
+            )
 
         self._roles = roles
 

swagger/api/api_container/__init__.py

@@ -27,6 +27,7 @@ from api_container.models.container_change_dto import ContainerChangeDto
 from api_container.models.container_create_request_dto import ContainerCreateRequestDto
 from api_container.models.container_dto import ContainerDto
 from api_container.models.creator_dto import CreatorDto
+from api_container.models.database_access_dto import DatabaseAccessDto
 from api_container.models.database_dto import DatabaseDto
 from api_container.models.granted_authority_dto import GrantedAuthorityDto
 from api_container.models.identifier_dto import IdentifierDto

swagger/api/api_container/models/__init__.py

@@ -20,6 +20,7 @@ from api_container.models.container_change_dto import ContainerChangeDto
 from api_container.models.container_create_request_dto import ContainerCreateRequestDto
 from api_container.models.container_dto import ContainerDto
 from api_container.models.creator_dto import CreatorDto
+from api_container.models.database_access_dto import DatabaseAccessDto
 from api_container.models.database_dto import DatabaseDto
 from api_container.models.granted_authority_dto import GrantedAuthorityDto
 from api_container.models.identifier_dto import IdentifierDto

swagger/api/api_database/api/__init__.py

@@ -3,5 +3,6 @@ from __future__ import absolute_import
 # flake8: noqa
 
 # import apis into api package
+from api_database.api.access_endpoint_api import AccessEndpointApi
 from api_database.api.database_endpoint_api import DatabaseEndpointApi
 from api_database.api.license_endpoint_api import LicenseEndpointApi