diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/DataServiceGatewayUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/DataServiceGatewayUnitTest.java
index c423d6b1ae5ef11aaaf47a11eda5af6147db579c..daeb1c1a96340323c85ca15080a3bc9d2685823e 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/DataServiceGatewayUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/DataServiceGatewayUnitTest.java
@@ -2,7 +2,7 @@ package at.tuwien.gateway;
import at.tuwien.ExportResourceDto;
import at.tuwien.api.database.AccessTypeDto;
-import at.tuwien.api.database.DatabaseBriefDto;
+import at.tuwien.api.database.DatabaseDto;
import at.tuwien.api.database.ViewDto;
import at.tuwien.api.database.query.QueryDto;
import at.tuwien.api.database.table.TableDto;
@@ -252,9 +252,9 @@ public class DataServiceGatewayUnitTest extends AbstractUnitTest {
DatabaseNotFoundException {
/* mock */
- when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(DatabaseBriefDto.class)))
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(DatabaseDto.class)))
.thenReturn(ResponseEntity.status(HttpStatus.CREATED)
- .body(DATABASE_1_BRIEF_DTO));
+ .body(DATABASE_1_DTO));
/* test */
dataServiceGateway.createDatabase(DATABASE_1_CREATE_INTERNAL);
@@ -266,7 +266,7 @@ public class DataServiceGatewayUnitTest extends AbstractUnitTest {
/* mock */
doThrow(HttpServerErrorException.class)
.when(dataServiceRestTemplate)
- .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(DatabaseBriefDto.class));
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(DatabaseDto.class));
/* test */
assertThrows(DataServiceConnectionException.class, () -> {
@@ -280,7 +280,7 @@ public class DataServiceGatewayUnitTest extends AbstractUnitTest {
/* mock */
doThrow(HttpClientErrorException.Unauthorized.class)
.when(dataServiceRestTemplate)
- .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(DatabaseBriefDto.class));
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(DatabaseDto.class));
/* test */
assertThrows(DataServiceException.class, () -> {
@@ -294,7 +294,7 @@ public class DataServiceGatewayUnitTest extends AbstractUnitTest {
/* mock */
doThrow(HttpClientErrorException.BadRequest.class)
.when(dataServiceRestTemplate)
- .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(DatabaseBriefDto.class));
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(DatabaseDto.class));
/* test */
assertThrows(DataServiceException.class, () -> {
@@ -306,7 +306,7 @@ public class DataServiceGatewayUnitTest extends AbstractUnitTest {
public void createDatabase_responseCode_fails() {
/* mock */
- when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(DatabaseBriefDto.class)))
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(DatabaseDto.class)))
.thenReturn(ResponseEntity.status(HttpStatus.NO_CONTENT)
.build());
diff --git a/lib/python/dbrepo/api/dto.py b/lib/python/dbrepo/api/dto.py
index 76f6d37a3a1ff2368beef7391769655229c9f16d..b7556a03a5424ad981c5a7988a7419224767bad9 100644
--- a/lib/python/dbrepo/api/dto.py
+++ b/lib/python/dbrepo/api/dto.py
@@ -113,11 +113,11 @@ class ContainerBrief(BaseModel):
class ColumnBrief(BaseModel):
id: int
name: str
- alias: str
database_id: int
table_id: int
internal_name: str
type: ColumnType
+ alias: Optional[str] = None
class TableBrief(BaseModel):
diff --git a/lib/python/tests/test_dtos.py b/lib/python/tests/test_dtos.py
index 54208a1d9a6baaebd6ecb7df7d505ded83594a3c..0a90949dba2aa42d0f9edc611cdcc37780350499 100644
--- a/lib/python/tests/test_dtos.py
+++ b/lib/python/tests/test_dtos.py
@@ -42,7 +42,7 @@ class AnalyseUnitTest(unittest.TestCase):
skipped: [str] = []
def setUp(self):
- with open('../../../.docs/.openapi/api.yaml', 'r') as f:
+ with open('../../.docs/.openapi/api.yaml', 'r') as f:
self.schemas = safe_load(f)['components']['schemas']
for name, obj in inspect.getmembers(sys.modules[dto.__name__]):
self.found += 1
diff --git a/lib/python/tests/test_unit_database.py b/lib/python/tests/test_unit_database.py
index 7605809e619b80bb94ea24855ee7908378660d17..203c296b9c86d9bca0fce4f3b433af298f6cd251 100644
--- a/lib/python/tests/test_unit_database.py
+++ b/lib/python/tests/test_unit_database.py
@@ -4,7 +4,7 @@ import requests_mock
from pydantic_core import ValidationError
from dbrepo.RestClient import RestClient
-from dbrepo.api.dto import Database, Container, Image, DatabaseAccess, AccessType, DatabaseBrief, UserBrief, \
+from dbrepo.api.dto import Database, DatabaseAccess, AccessType, DatabaseBrief, UserBrief, \
ContainerBrief, ImageBrief
from dbrepo.api.exceptions import ResponseCodeError, NotExistsError, ForbiddenError, MalformedError, AuthenticationError
@@ -24,7 +24,7 @@ class DatabaseUnitTest(unittest.TestCase):
DatabaseBrief(
id=1,
name='test',
- owner=UserBrief(id='8638c043-5145-4be8-a3e4-4b79991b0a16', username='mweise'),
+ owner_id='8638c043-5145-4be8-a3e4-4b79991b0a16',
contact=UserBrief(id='8638c043-5145-4be8-a3e4-4b79991b0a16', username='mweise'),
internal_name='test_abcd',
is_public=True,
diff --git a/lib/python/tests/test_unit_identifier.py b/lib/python/tests/test_unit_identifier.py
index 45b0a919e74d79d2420669a7036fcc87ae02b92a..0c71c0216f94403e71351415a1aa5ace6049d442 100644
--- a/lib/python/tests/test_unit_identifier.py
+++ b/lib/python/tests/test_unit_identifier.py
@@ -1,14 +1,12 @@
import unittest
import requests_mock
-import datetime
from dbrepo.RestClient import RestClient
-
-from dbrepo.api.dto import Identifier, IdentifierType, CreateIdentifierTitle, CreateIdentifierCreator, \
- IdentifierCreator, IdentifierTitle, IdentifierDescription, CreateIdentifierDescription, Language, \
- CreateIdentifierFunder, CreateRelatedIdentifier, RelatedIdentifierRelation, RelatedIdentifierType, IdentifierFunder, \
- RelatedIdentifier, UserBrief, IdentifierStatusType
+from dbrepo.api.dto import Identifier, IdentifierType, CreateIdentifierTitle, Creator, IdentifierTitle, \
+ IdentifierDescription, CreateIdentifierDescription, Language, CreateIdentifierFunder, CreateRelatedIdentifier, \
+ RelatedIdentifierRelation, RelatedIdentifierType, IdentifierFunder, RelatedIdentifier, UserBrief, \
+ IdentifierStatusType, CreateIdentifierCreator
from dbrepo.api.exceptions import MalformedError, ForbiddenError, NotExistsError, AuthenticationError
@@ -29,7 +27,7 @@ class IdentifierUnitTest(unittest.TestCase):
related_identifiers=[
RelatedIdentifier(id=7, value='10.12345/abc', relation=RelatedIdentifierRelation.CITES,
type=RelatedIdentifierType.DOI)],
- creators=[IdentifierCreator(id=5, creator_name='Carberry, Josiah')],
+ creators=[Creator(id=5, creator_name='Carberry, Josiah')],
status=IdentifierStatusType.PUBLISHED,
owner=UserBrief(id='8638c043-5145-4be8-a3e4-4b79991b0a16', username='mweise'))
# mock
@@ -127,7 +125,7 @@ class IdentifierUnitTest(unittest.TestCase):
related_identifiers=[RelatedIdentifier(id=7, value='10.12345/abc',
relation=RelatedIdentifierRelation.CITES,
type=RelatedIdentifierType.DOI)],
- creators=[IdentifierCreator(id=5, creator_name='Carberry, Josiah')],
+ creators=[Creator(id=5, creator_name='Carberry, Josiah')],
status=IdentifierStatusType.PUBLISHED,
owner=UserBrief(id='8638c043-5145-4be8-a3e4-4b79991b0a16', username='mweise'))]
# mock
diff --git a/lib/python/tests/test_unit_table.py b/lib/python/tests/test_unit_table.py
index 4c4ad2af6aabbe6a36689fe3a44b50b8f6f625dc..36391e1fdd29d16d8ac65f3aaa823e6be34ca414 100644
--- a/lib/python/tests/test_unit_table.py
+++ b/lib/python/tests/test_unit_table.py
@@ -6,7 +6,7 @@ from pandas import DataFrame
from dbrepo.RestClient import RestClient
from dbrepo.api.dto import Table, CreateTableConstraints, Column, Constraints, ColumnType, ConceptBrief, UnitBrief, \
- TableStatistics, ColumnStatistic, PrimaryKey, TableMinimal, ColumnMinimal, TableBrief, UserBrief
+ TableStatistics, ColumnStatistic, PrimaryKey, ColumnBrief, TableBrief, UserBrief
from dbrepo.api.exceptions import MalformedError, ForbiddenError, NotExistsError, NameExistsError, \
AuthenticationError, ExternalSystemError
@@ -29,9 +29,20 @@ class TableUnitTest(unittest.TestCase):
foreign_keys=[],
checks=[],
primary_key=[PrimaryKey(id=1,
- table=TableMinimal(id=2, database_id=1),
- column=ColumnMinimal(id=1, table_id=2,
- database_id=1))]),
+ table=TableBrief(id=2, database_id=1,
+ name='Other',
+ internal_name='other',
+ description=None,
+ is_versioned=True,
+ is_public=True,
+ is_schema_public=True,
+ owned_by='8638c043-5145-4be8-a3e4-4b79991b0a16'),
+ column=ColumnBrief(id=1, table_id=2,
+ database_id=1,
+ name='id',
+ alias=None,
+ internal_name='id',
+ type=ColumnType.BIGINT))]),
columns=[Column(id=1,
ord=0,
name="ID",
@@ -159,9 +170,20 @@ class TableUnitTest(unittest.TestCase):
foreign_keys=[],
checks=[],
primary_key=[PrimaryKey(id=1,
- table=TableMinimal(id=2, database_id=1),
- column=ColumnMinimal(id=1, table_id=2,
- database_id=1))]),
+ table=TableBrief(id=2, database_id=1,
+ name='Other',
+ internal_name='other',
+ description=None,
+ is_versioned=True,
+ is_public=True,
+ is_schema_public=True,
+ owned_by='8638c043-5145-4be8-a3e4-4b79991b0a16'),
+ column=ColumnBrief(id=1, table_id=2,
+ database_id=1,
+ name='id',
+ alias=None,
+ internal_name='id',
+ type=ColumnType.BIGINT))]),
columns=[Column(id=1,
name="ID",
ord=0,