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

FIxed permission errors for modifying tuples

parent a28d6669
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.
Showing
with 194 additions and 47 deletions
...@@ -23,8 +23,6 @@ from api_authentication.api_client import ApiClient ...@@ -23,8 +23,6 @@ from api_authentication.api_client import ApiClient
from api_authentication.configuration import Configuration from api_authentication.configuration import Configuration
# import models into sdk package # import models into sdk package
from api_authentication.models.api_error_dto import ApiErrorDto from api_authentication.models.api_error_dto import ApiErrorDto
from api_authentication.models.column_dto import ColumnDto
from api_authentication.models.concept_dto import ConceptDto
from api_authentication.models.container_dto import ContainerDto from api_authentication.models.container_dto import ContainerDto
from api_authentication.models.database_dto import DatabaseDto from api_authentication.models.database_dto import DatabaseDto
from api_authentication.models.granted_authority_dto import GrantedAuthorityDto from api_authentication.models.granted_authority_dto import GrantedAuthorityDto
...@@ -36,7 +34,8 @@ from api_authentication.models.jwt_response_dto import JwtResponseDto ...@@ -36,7 +34,8 @@ from api_authentication.models.jwt_response_dto import JwtResponseDto
from api_authentication.models.license_dto import LicenseDto from api_authentication.models.license_dto import LicenseDto
from api_authentication.models.login_request_dto import LoginRequestDto from api_authentication.models.login_request_dto import LoginRequestDto
from api_authentication.models.signup_request_dto import SignupRequestDto from api_authentication.models.signup_request_dto import SignupRequestDto
from api_authentication.models.table_dto import TableDto from api_authentication.models.table_brief_dto import TableBriefDto
from api_authentication.models.user_brief_dto import UserBriefDto
from api_authentication.models.user_dto import UserDto from api_authentication.models.user_dto import UserDto
from api_authentication.models.user_email_dto import UserEmailDto from api_authentication.models.user_email_dto import UserEmailDto
from api_authentication.models.user_forgot_dto import UserForgotDto from api_authentication.models.user_forgot_dto import UserForgotDto
......
...@@ -15,8 +15,6 @@ from __future__ import absolute_import ...@@ -15,8 +15,6 @@ from __future__ import absolute_import
# import models into model package # import models into model package
from api_authentication.models.api_error_dto import ApiErrorDto from api_authentication.models.api_error_dto import ApiErrorDto
from api_authentication.models.column_dto import ColumnDto
from api_authentication.models.concept_dto import ConceptDto
from api_authentication.models.container_dto import ContainerDto from api_authentication.models.container_dto import ContainerDto
from api_authentication.models.database_dto import DatabaseDto from api_authentication.models.database_dto import DatabaseDto
from api_authentication.models.granted_authority_dto import GrantedAuthorityDto from api_authentication.models.granted_authority_dto import GrantedAuthorityDto
...@@ -28,7 +26,8 @@ from api_authentication.models.jwt_response_dto import JwtResponseDto ...@@ -28,7 +26,8 @@ from api_authentication.models.jwt_response_dto import JwtResponseDto
from api_authentication.models.license_dto import LicenseDto from api_authentication.models.license_dto import LicenseDto
from api_authentication.models.login_request_dto import LoginRequestDto from api_authentication.models.login_request_dto import LoginRequestDto
from api_authentication.models.signup_request_dto import SignupRequestDto from api_authentication.models.signup_request_dto import SignupRequestDto
from api_authentication.models.table_dto import TableDto from api_authentication.models.table_brief_dto import TableBriefDto
from api_authentication.models.user_brief_dto import UserBriefDto
from api_authentication.models.user_dto import UserDto from api_authentication.models.user_dto import UserDto
from api_authentication.models.user_email_dto import UserEmailDto from api_authentication.models.user_email_dto import UserEmailDto
from api_authentication.models.user_forgot_dto import UserForgotDto from api_authentication.models.user_forgot_dto import UserForgotDto
......
...@@ -38,7 +38,7 @@ class DatabaseDto(object): ...@@ -38,7 +38,7 @@ class DatabaseDto(object):
'description': 'str', 'description': 'str',
'publisher': 'str', 'publisher': 'str',
'contact': 'UserDto', 'contact': 'UserDto',
'tables': 'list[TableDto]', 'tables': 'list[TableBriefDto]',
'image': 'ImageDto', 'image': 'ImageDto',
'container': 'ContainerDto', 'container': 'ContainerDto',
'created': 'datetime', 'created': 'datetime',
...@@ -352,7 +352,7 @@ class DatabaseDto(object): ...@@ -352,7 +352,7 @@ class DatabaseDto(object):
:return: The tables of this DatabaseDto. # noqa: E501 :return: The tables of this DatabaseDto. # noqa: E501
:rtype: list[TableDto] :rtype: list[TableBriefDto]
""" """
return self._tables return self._tables
...@@ -362,7 +362,7 @@ class DatabaseDto(object): ...@@ -362,7 +362,7 @@ class DatabaseDto(object):
:param tables: The tables of this DatabaseDto. # noqa: E501 :param tables: The tables of this DatabaseDto. # noqa: E501
:type: list[TableDto] :type: list[TableBriefDto]
""" """
self._tables = tables self._tables = tables
......
...@@ -22,8 +22,6 @@ from api_container.api_client import ApiClient ...@@ -22,8 +22,6 @@ from api_container.api_client import ApiClient
from api_container.configuration import Configuration from api_container.configuration import Configuration
# import models into sdk package # import models into sdk package
from api_container.models.api_error_dto import ApiErrorDto from api_container.models.api_error_dto import ApiErrorDto
from api_container.models.column_dto import ColumnDto
from api_container.models.concept_dto import ConceptDto
from api_container.models.container_brief_dto import ContainerBriefDto from api_container.models.container_brief_dto import ContainerBriefDto
from api_container.models.container_change_dto import ContainerChangeDto from api_container.models.container_change_dto import ContainerChangeDto
from api_container.models.container_create_request_dto import ContainerCreateRequestDto from api_container.models.container_create_request_dto import ContainerCreateRequestDto
...@@ -37,6 +35,6 @@ from api_container.models.image_date_dto import ImageDateDto ...@@ -37,6 +35,6 @@ from api_container.models.image_date_dto import ImageDateDto
from api_container.models.image_dto import ImageDto from api_container.models.image_dto import ImageDto
from api_container.models.image_env_item_dto import ImageEnvItemDto from api_container.models.image_env_item_dto import ImageEnvItemDto
from api_container.models.license_dto import LicenseDto from api_container.models.license_dto import LicenseDto
from api_container.models.table_dto import TableDto from api_container.models.table_brief_dto import TableBriefDto
from api_container.models.user_brief_dto import UserBriefDto from api_container.models.user_brief_dto import UserBriefDto
from api_container.models.user_dto import UserDto from api_container.models.user_dto import UserDto
...@@ -15,8 +15,6 @@ from __future__ import absolute_import ...@@ -15,8 +15,6 @@ from __future__ import absolute_import
# import models into model package # import models into model package
from api_container.models.api_error_dto import ApiErrorDto from api_container.models.api_error_dto import ApiErrorDto
from api_container.models.column_dto import ColumnDto
from api_container.models.concept_dto import ConceptDto
from api_container.models.container_brief_dto import ContainerBriefDto from api_container.models.container_brief_dto import ContainerBriefDto
from api_container.models.container_change_dto import ContainerChangeDto from api_container.models.container_change_dto import ContainerChangeDto
from api_container.models.container_create_request_dto import ContainerCreateRequestDto from api_container.models.container_create_request_dto import ContainerCreateRequestDto
...@@ -30,6 +28,6 @@ from api_container.models.image_date_dto import ImageDateDto ...@@ -30,6 +28,6 @@ from api_container.models.image_date_dto import ImageDateDto
from api_container.models.image_dto import ImageDto from api_container.models.image_dto import ImageDto
from api_container.models.image_env_item_dto import ImageEnvItemDto from api_container.models.image_env_item_dto import ImageEnvItemDto
from api_container.models.license_dto import LicenseDto from api_container.models.license_dto import LicenseDto
from api_container.models.table_dto import TableDto from api_container.models.table_brief_dto import TableBriefDto
from api_container.models.user_brief_dto import UserBriefDto from api_container.models.user_brief_dto import UserBriefDto
from api_container.models.user_dto import UserDto from api_container.models.user_dto import UserDto
...@@ -38,7 +38,7 @@ class DatabaseDto(object): ...@@ -38,7 +38,7 @@ class DatabaseDto(object):
'description': 'str', 'description': 'str',
'publisher': 'str', 'publisher': 'str',
'contact': 'UserDto', 'contact': 'UserDto',
'tables': 'list[TableDto]', 'tables': 'list[TableBriefDto]',
'image': 'ImageDto', 'image': 'ImageDto',
'container': 'ContainerDto', 'container': 'ContainerDto',
'created': 'datetime', 'created': 'datetime',
...@@ -352,7 +352,7 @@ class DatabaseDto(object): ...@@ -352,7 +352,7 @@ class DatabaseDto(object):
:return: The tables of this DatabaseDto. # noqa: E501 :return: The tables of this DatabaseDto. # noqa: E501
:rtype: list[TableDto] :rtype: list[TableBriefDto]
""" """
return self._tables return self._tables
...@@ -362,7 +362,7 @@ class DatabaseDto(object): ...@@ -362,7 +362,7 @@ class DatabaseDto(object):
:param tables: The tables of this DatabaseDto. # noqa: E501 :param tables: The tables of this DatabaseDto. # noqa: E501
:type: list[TableDto] :type: list[TableBriefDto]
""" """
self._tables = tables self._tables = tables
......
...@@ -22,8 +22,6 @@ from api_database.api_client import ApiClient ...@@ -22,8 +22,6 @@ from api_database.api_client import ApiClient
from api_database.configuration import Configuration from api_database.configuration import Configuration
# import models into sdk package # import models into sdk package
from api_database.models.api_error_dto import ApiErrorDto from api_database.models.api_error_dto import ApiErrorDto
from api_database.models.column_dto import ColumnDto
from api_database.models.concept_dto import ConceptDto
from api_database.models.container_brief_dto import ContainerBriefDto from api_database.models.container_brief_dto import ContainerBriefDto
from api_database.models.container_dto import ContainerDto from api_database.models.container_dto import ContainerDto
from api_database.models.database_brief_dto import DatabaseBriefDto from api_database.models.database_brief_dto import DatabaseBriefDto
...@@ -36,6 +34,6 @@ from api_database.models.image_date_dto import ImageDateDto ...@@ -36,6 +34,6 @@ from api_database.models.image_date_dto import ImageDateDto
from api_database.models.image_dto import ImageDto from api_database.models.image_dto import ImageDto
from api_database.models.image_env_item_dto import ImageEnvItemDto from api_database.models.image_env_item_dto import ImageEnvItemDto
from api_database.models.license_dto import LicenseDto from api_database.models.license_dto import LicenseDto
from api_database.models.table_dto import TableDto from api_database.models.table_brief_dto import TableBriefDto
from api_database.models.user_brief_dto import UserBriefDto from api_database.models.user_brief_dto import UserBriefDto
from api_database.models.user_dto import UserDto from api_database.models.user_dto import UserDto
...@@ -15,8 +15,6 @@ from __future__ import absolute_import ...@@ -15,8 +15,6 @@ from __future__ import absolute_import
# import models into model package # import models into model package
from api_database.models.api_error_dto import ApiErrorDto from api_database.models.api_error_dto import ApiErrorDto
from api_database.models.column_dto import ColumnDto
from api_database.models.concept_dto import ConceptDto
from api_database.models.container_brief_dto import ContainerBriefDto from api_database.models.container_brief_dto import ContainerBriefDto
from api_database.models.container_dto import ContainerDto from api_database.models.container_dto import ContainerDto
from api_database.models.database_brief_dto import DatabaseBriefDto from api_database.models.database_brief_dto import DatabaseBriefDto
...@@ -29,6 +27,6 @@ from api_database.models.image_date_dto import ImageDateDto ...@@ -29,6 +27,6 @@ from api_database.models.image_date_dto import ImageDateDto
from api_database.models.image_dto import ImageDto from api_database.models.image_dto import ImageDto
from api_database.models.image_env_item_dto import ImageEnvItemDto from api_database.models.image_env_item_dto import ImageEnvItemDto
from api_database.models.license_dto import LicenseDto from api_database.models.license_dto import LicenseDto
from api_database.models.table_dto import TableDto from api_database.models.table_brief_dto import TableBriefDto
from api_database.models.user_brief_dto import UserBriefDto from api_database.models.user_brief_dto import UserBriefDto
from api_database.models.user_dto import UserDto from api_database.models.user_dto import UserDto
...@@ -38,7 +38,7 @@ class DatabaseDto(object): ...@@ -38,7 +38,7 @@ class DatabaseDto(object):
'description': 'str', 'description': 'str',
'publisher': 'str', 'publisher': 'str',
'contact': 'UserDto', 'contact': 'UserDto',
'tables': 'list[TableDto]', 'tables': 'list[TableBriefDto]',
'image': 'ImageDto', 'image': 'ImageDto',
'container': 'ContainerDto', 'container': 'ContainerDto',
'created': 'datetime', 'created': 'datetime',
...@@ -352,7 +352,7 @@ class DatabaseDto(object): ...@@ -352,7 +352,7 @@ class DatabaseDto(object):
:return: The tables of this DatabaseDto. # noqa: E501 :return: The tables of this DatabaseDto. # noqa: E501
:rtype: list[TableDto] :rtype: list[TableBriefDto]
""" """
return self._tables return self._tables
...@@ -362,7 +362,7 @@ class DatabaseDto(object): ...@@ -362,7 +362,7 @@ class DatabaseDto(object):
:param tables: The tables of this DatabaseDto. # noqa: E501 :param tables: The tables of this DatabaseDto. # noqa: E501
:type: list[TableDto] :type: list[TableBriefDto]
""" """
self._tables = tables self._tables = tables
......
...@@ -22,8 +22,6 @@ from api_identifier.api_client import ApiClient ...@@ -22,8 +22,6 @@ from api_identifier.api_client import ApiClient
from api_identifier.configuration import Configuration from api_identifier.configuration import Configuration
# import models into sdk package # import models into sdk package
from api_identifier.models.api_error_dto import ApiErrorDto from api_identifier.models.api_error_dto import ApiErrorDto
from api_identifier.models.column_dto import ColumnDto
from api_identifier.models.concept_dto import ConceptDto
from api_identifier.models.container_dto import ContainerDto from api_identifier.models.container_dto import ContainerDto
from api_identifier.models.creator_create_dto import CreatorCreateDto from api_identifier.models.creator_create_dto import CreatorCreateDto
from api_identifier.models.creator_dto import CreatorDto from api_identifier.models.creator_dto import CreatorDto
...@@ -38,5 +36,6 @@ from api_identifier.models.image_env_item_dto import ImageEnvItemDto ...@@ -38,5 +36,6 @@ from api_identifier.models.image_env_item_dto import ImageEnvItemDto
from api_identifier.models.license_dto import LicenseDto from api_identifier.models.license_dto import LicenseDto
from api_identifier.models.related_identifier_create_dto import RelatedIdentifierCreateDto from api_identifier.models.related_identifier_create_dto import RelatedIdentifierCreateDto
from api_identifier.models.related_identifier_dto import RelatedIdentifierDto from api_identifier.models.related_identifier_dto import RelatedIdentifierDto
from api_identifier.models.table_dto import TableDto from api_identifier.models.table_brief_dto import TableBriefDto
from api_identifier.models.user_brief_dto import UserBriefDto
from api_identifier.models.user_dto import UserDto from api_identifier.models.user_dto import UserDto
...@@ -15,8 +15,6 @@ from __future__ import absolute_import ...@@ -15,8 +15,6 @@ from __future__ import absolute_import
# import models into model package # import models into model package
from api_identifier.models.api_error_dto import ApiErrorDto from api_identifier.models.api_error_dto import ApiErrorDto
from api_identifier.models.column_dto import ColumnDto
from api_identifier.models.concept_dto import ConceptDto
from api_identifier.models.container_dto import ContainerDto from api_identifier.models.container_dto import ContainerDto
from api_identifier.models.creator_create_dto import CreatorCreateDto from api_identifier.models.creator_create_dto import CreatorCreateDto
from api_identifier.models.creator_dto import CreatorDto from api_identifier.models.creator_dto import CreatorDto
...@@ -31,5 +29,6 @@ from api_identifier.models.image_env_item_dto import ImageEnvItemDto ...@@ -31,5 +29,6 @@ from api_identifier.models.image_env_item_dto import ImageEnvItemDto
from api_identifier.models.license_dto import LicenseDto from api_identifier.models.license_dto import LicenseDto
from api_identifier.models.related_identifier_create_dto import RelatedIdentifierCreateDto from api_identifier.models.related_identifier_create_dto import RelatedIdentifierCreateDto
from api_identifier.models.related_identifier_dto import RelatedIdentifierDto from api_identifier.models.related_identifier_dto import RelatedIdentifierDto
from api_identifier.models.table_dto import TableDto from api_identifier.models.table_brief_dto import TableBriefDto
from api_identifier.models.user_brief_dto import UserBriefDto
from api_identifier.models.user_dto import UserDto from api_identifier.models.user_dto import UserDto
...@@ -25,8 +25,6 @@ from api_query.api_client import ApiClient ...@@ -25,8 +25,6 @@ from api_query.api_client import ApiClient
from api_query.configuration import Configuration from api_query.configuration import Configuration
# import models into sdk package # import models into sdk package
from api_query.models.api_error_dto import ApiErrorDto from api_query.models.api_error_dto import ApiErrorDto
from api_query.models.column_dto import ColumnDto
from api_query.models.concept_dto import ConceptDto
from api_query.models.container_dto import ContainerDto from api_query.models.container_dto import ContainerDto
from api_query.models.database_dto import DatabaseDto from api_query.models.database_dto import DatabaseDto
from api_query.models.execute_statement_dto import ExecuteStatementDto from api_query.models.execute_statement_dto import ExecuteStatementDto
...@@ -39,8 +37,10 @@ from api_query.models.import_dto import ImportDto ...@@ -39,8 +37,10 @@ from api_query.models.import_dto import ImportDto
from api_query.models.license_dto import LicenseDto from api_query.models.license_dto import LicenseDto
from api_query.models.query_dto import QueryDto from api_query.models.query_dto import QueryDto
from api_query.models.query_result_dto import QueryResultDto from api_query.models.query_result_dto import QueryResultDto
from api_query.models.table_brief_dto import TableBriefDto
from api_query.models.table_csv_delete_dto import TableCsvDeleteDto from api_query.models.table_csv_delete_dto import TableCsvDeleteDto
from api_query.models.table_csv_dto import TableCsvDto from api_query.models.table_csv_dto import TableCsvDto
from api_query.models.table_dto import TableDto from api_query.models.table_csv_update_dto import TableCsvUpdateDto
from api_query.models.table_history_dto import TableHistoryDto from api_query.models.table_history_dto import TableHistoryDto
from api_query.models.user_brief_dto import UserBriefDto
from api_query.models.user_dto import UserDto from api_query.models.user_dto import UserDto
...@@ -361,7 +361,7 @@ class QueryEndpointApi(object): ...@@ -361,7 +361,7 @@ class QueryEndpointApi(object):
['*/*']) # noqa: E501 ['*/*']) # noqa: E501
# Authentication setting # Authentication setting
auth_settings = [] # noqa: E501 auth_settings = ['bearerAuth'] # noqa: E501
return self.api_client.call_api( return self.api_client.call_api(
'/api/container/{id}/database/{databaseId}/query/{queryId}', 'PUT', '/api/container/{id}/database/{databaseId}/query/{queryId}', 'PUT',
......
...@@ -636,3 +636,124 @@ class TableDataEndpointApi(object): ...@@ -636,3 +636,124 @@ class TableDataEndpointApi(object):
_preload_content=params.get('_preload_content', True), _preload_content=params.get('_preload_content', True),
_request_timeout=params.get('_request_timeout'), _request_timeout=params.get('_request_timeout'),
collection_formats=collection_formats) collection_formats=collection_formats)
def update(self, body, id, database_id, table_id, **kwargs): # noqa: E501
"""Update data # noqa: E501
This method makes a synchronous HTTP request by default. To make an
asynchronous HTTP request, please pass async_req=True
>>> thread = api.update(body, id, database_id, table_id, async_req=True)
>>> result = thread.get()
:param async_req bool
:param TableCsvUpdateDto body: (required)
:param int id: (required)
:param int database_id: (required)
:param int table_id: (required)
:return: None
If the method is called asynchronously,
returns the request thread.
"""
kwargs['_return_http_data_only'] = True
if kwargs.get('async_req'):
return self.update_with_http_info(body, id, database_id, table_id, **kwargs) # noqa: E501
else:
(data) = self.update_with_http_info(body, id, database_id, table_id, **kwargs) # noqa: E501
return data
def update_with_http_info(self, body, id, database_id, table_id, **kwargs): # noqa: E501
"""Update data # noqa: E501
This method makes a synchronous HTTP request by default. To make an
asynchronous HTTP request, please pass async_req=True
>>> thread = api.update_with_http_info(body, id, database_id, table_id, async_req=True)
>>> result = thread.get()
:param async_req bool
:param TableCsvUpdateDto body: (required)
:param int id: (required)
:param int database_id: (required)
:param int table_id: (required)
:return: None
If the method is called asynchronously,
returns the request thread.
"""
all_params = ['body', 'id', 'database_id', 'table_id'] # noqa: E501
all_params.append('async_req')
all_params.append('_return_http_data_only')
all_params.append('_preload_content')
all_params.append('_request_timeout')
params = locals()
for key, val in six.iteritems(params['kwargs']):
if key not in all_params:
raise TypeError(
"Got an unexpected keyword argument '%s'"
" to method update" % key
)
params[key] = val
del params['kwargs']
# verify the required parameter 'body' is set
if ('body' not in params or
params['body'] is None):
raise ValueError("Missing the required parameter `body` when calling `update`") # noqa: E501
# verify the required parameter 'id' is set
if ('id' not in params or
params['id'] is None):
raise ValueError("Missing the required parameter `id` when calling `update`") # noqa: E501
# verify the required parameter 'database_id' is set
if ('database_id' not in params or
params['database_id'] is None):
raise ValueError("Missing the required parameter `database_id` when calling `update`") # noqa: E501
# verify the required parameter 'table_id' is set
if ('table_id' not in params or
params['table_id'] is None):
raise ValueError("Missing the required parameter `table_id` when calling `update`") # noqa: E501
collection_formats = {}
path_params = {}
if 'id' in params:
path_params['id'] = params['id'] # noqa: E501
if 'database_id' in params:
path_params['databaseId'] = params['database_id'] # noqa: E501
if 'table_id' in params:
path_params['tableId'] = params['table_id'] # noqa: E501
query_params = []
header_params = {}
form_params = []
local_var_files = {}
body_params = None
if 'body' in params:
body_params = params['body']
# HTTP header `Accept`
header_params['Accept'] = self.api_client.select_header_accept(
['*/*']) # noqa: E501
# HTTP header `Content-Type`
header_params['Content-Type'] = self.api_client.select_header_content_type( # noqa: E501
['application/json']) # noqa: E501
# Authentication setting
auth_settings = ['bearerAuth'] # noqa: E501
return self.api_client.call_api(
'/api/container/{id}/database/{databaseId}/table/{tableId}/data', 'PUT',
path_params,
query_params,
header_params,
body=body_params,
post_params=form_params,
files=local_var_files,
response_type=None, # noqa: E501
auth_settings=auth_settings,
async_req=params.get('async_req'),
_return_http_data_only=params.get('_return_http_data_only'),
_preload_content=params.get('_preload_content', True),
_request_timeout=params.get('_request_timeout'),
collection_formats=collection_formats)
...@@ -15,8 +15,6 @@ from __future__ import absolute_import ...@@ -15,8 +15,6 @@ from __future__ import absolute_import
# import models into model package # import models into model package
from api_query.models.api_error_dto import ApiErrorDto from api_query.models.api_error_dto import ApiErrorDto
from api_query.models.column_dto import ColumnDto
from api_query.models.concept_dto import ConceptDto
from api_query.models.container_dto import ContainerDto from api_query.models.container_dto import ContainerDto
from api_query.models.database_dto import DatabaseDto from api_query.models.database_dto import DatabaseDto
from api_query.models.execute_statement_dto import ExecuteStatementDto from api_query.models.execute_statement_dto import ExecuteStatementDto
...@@ -29,8 +27,10 @@ from api_query.models.import_dto import ImportDto ...@@ -29,8 +27,10 @@ from api_query.models.import_dto import ImportDto
from api_query.models.license_dto import LicenseDto from api_query.models.license_dto import LicenseDto
from api_query.models.query_dto import QueryDto from api_query.models.query_dto import QueryDto
from api_query.models.query_result_dto import QueryResultDto from api_query.models.query_result_dto import QueryResultDto
from api_query.models.table_brief_dto import TableBriefDto
from api_query.models.table_csv_delete_dto import TableCsvDeleteDto from api_query.models.table_csv_delete_dto import TableCsvDeleteDto
from api_query.models.table_csv_dto import TableCsvDto from api_query.models.table_csv_dto import TableCsvDto
from api_query.models.table_dto import TableDto from api_query.models.table_csv_update_dto import TableCsvUpdateDto
from api_query.models.table_history_dto import TableHistoryDto from api_query.models.table_history_dto import TableHistoryDto
from api_query.models.user_brief_dto import UserBriefDto
from api_query.models.user_dto import UserDto from api_query.models.user_dto import UserDto
...@@ -38,7 +38,7 @@ class DatabaseDto(object): ...@@ -38,7 +38,7 @@ class DatabaseDto(object):
'description': 'str', 'description': 'str',
'publisher': 'str', 'publisher': 'str',
'contact': 'UserDto', 'contact': 'UserDto',
'tables': 'list[TableDto]', 'tables': 'list[TableBriefDto]',
'image': 'ImageDto', 'image': 'ImageDto',
'container': 'ContainerDto', 'container': 'ContainerDto',
'created': 'datetime', 'created': 'datetime',
...@@ -352,7 +352,7 @@ class DatabaseDto(object): ...@@ -352,7 +352,7 @@ class DatabaseDto(object):
:return: The tables of this DatabaseDto. # noqa: E501 :return: The tables of this DatabaseDto. # noqa: E501
:rtype: list[TableDto] :rtype: list[TableBriefDto]
""" """
return self._tables return self._tables
...@@ -362,7 +362,7 @@ class DatabaseDto(object): ...@@ -362,7 +362,7 @@ class DatabaseDto(object):
:param tables: The tables of this DatabaseDto. # noqa: E501 :param tables: The tables of this DatabaseDto. # noqa: E501
:type: list[TableDto] :type: list[TableBriefDto]
""" """
self._tables = tables self._tables = tables
......
...@@ -4,6 +4,7 @@ import time ...@@ -4,6 +4,7 @@ import time
import os import os
import shutil import shutil
import uuid import uuid
from postgres import Postgres
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
...@@ -219,6 +220,27 @@ def delete_tuple(container_id, database_id, table_id, keys): ...@@ -219,6 +220,27 @@ def delete_tuple(container_id, database_id, table_id, keys):
return response return response
def update_user(user_id):
response = user.update({
"firstname": "Josiah",
"lastname": "Carberry",
"affiliation": "Wesleyan University",
"orcid": "0000-0002-1825-0097",
"titles_after": "PhD"
}, user_id)
print("updated user with id %d" % user_id)
def update_theme(user_id):
response = user.update_theme({
"theme_dark": True
}, user_id)
print("updated theme user with id %d" % user_id)
def verify_user(user_id):
db = Postgres("dbname=fda user=postgres password=postgres")
token = db.one("SELECT ")
if __name__ == '__main__': if __name__ == '__main__':
# #
# create 1 user and 3 containers (public, private, public) # create 1 user and 3 containers (public, private, public)
...@@ -310,3 +332,10 @@ if __name__ == '__main__': ...@@ -310,3 +332,10 @@ if __name__ == '__main__':
tname = find_table(1, 1, 1).internal_name tname = find_table(1, 1, 1).internal_name
qid = create_query(1, 1, "select `id` from `" + tname + "`").id qid = create_query(1, 1, "select `id` from `" + tname + "`").id
create_identifier(1, 1, qid) create_identifier(1, 1, qid)
#
# create 1 user and modify information
#
uid = create_user("test3").id
auth_user("test3")
update_user(uid)
update_theme(uid)
requests>=2.28.0 requests>=2.28.0
pandas>=1.4.3 pandas>=1.4.3
postgres>=4.0
\ No newline at end of file
...@@ -2,8 +2,10 @@ package at.tuwien.api.database; ...@@ -2,8 +2,10 @@ package at.tuwien.api.database;
import at.tuwien.api.container.ContainerDto; import at.tuwien.api.container.ContainerDto;
import at.tuwien.api.container.image.ImageDto; import at.tuwien.api.container.image.ImageDto;
import at.tuwien.api.database.table.TableBriefDto;
import at.tuwien.api.database.table.TableDto; import at.tuwien.api.database.table.TableDto;
import at.tuwien.api.identifier.CreatorDto; import at.tuwien.api.identifier.CreatorDto;
import at.tuwien.api.user.UserBriefDto;
import at.tuwien.api.user.UserDto; import at.tuwien.api.user.UserDto;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
...@@ -37,7 +39,7 @@ public class DatabaseDto { ...@@ -37,7 +39,7 @@ public class DatabaseDto {
@NotNull @NotNull
@Parameter(name = "database creator") @Parameter(name = "database creator")
private UserDto creator; private UserBriefDto creator;
@NotBlank @NotBlank
@JsonProperty("internal_name") @JsonProperty("internal_name")
...@@ -67,7 +69,7 @@ public class DatabaseDto { ...@@ -67,7 +69,7 @@ public class DatabaseDto {
private String publication; private String publication;
@Parameter(name = "tables") @Parameter(name = "tables")
private List<TableDto> tables; private List<TableBriefDto> tables;
@JsonProperty("is_public") @JsonProperty("is_public")
@Parameter(name = "database public") @Parameter(name = "database public")
......
package at.tuwien.api.database.table; package at.tuwien.api.database.table;
import at.tuwien.api.database.table.columns.ColumnDto; import at.tuwien.api.database.table.columns.ColumnDto;
import at.tuwien.api.user.UserBriefDto;
import at.tuwien.api.user.UserDto; import at.tuwien.api.user.UserDto;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
...@@ -10,6 +11,7 @@ import lombok.*; ...@@ -10,6 +11,7 @@ import lombok.*;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.time.Instant; import java.time.Instant;
import java.util.List;
@Getter @Getter
@Setter @Setter
...@@ -32,6 +34,10 @@ public class TableDto { ...@@ -32,6 +34,10 @@ public class TableDto {
@Parameter(name = "table internal name", example = "weather_australia") @Parameter(name = "table internal name", example = "weather_australia")
private String internalName; private String internalName;
@NotNull
@Parameter(name = "database creator")
private UserBriefDto creator;
@NotBlank @NotBlank
@Parameter(name = "topic name", example = "fda.c1.d1.t1") @Parameter(name = "topic name", example = "fda.c1.d1.t1")
private String topic; private String topic;
...@@ -46,6 +52,6 @@ public class TableDto { ...@@ -46,6 +52,6 @@ public class TableDto {
@NotNull @NotNull
@Parameter(name = "table columns") @Parameter(name = "table columns")
private ColumnDto[] columns; private List<ColumnDto> columns;
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment