Skip to content
Snippets Groups Projects
Verified Commit 8baeb962 authored by Martin Weise's avatar Martin Weise
Browse files

WIP

parent eeba6b6b
No related branches found
No related tags found
7 merge requests!345Updated docs and endpoints:,!341Fixed mapping problem where UK and FK share columns they are inserted,!339Fixed mapping problem where UK and FK share columns they are inserted,!338Fixed mapping problem where UK and FK share columns they are inserted,!334Fixed mapping problem where UK and FK share columns they are inserted,!333Fixed mapping problem where UK and FK share columns they are inserted,!328Hotfix/mapping
...@@ -9,6 +9,7 @@ import at.tuwien.api.database.table.internal.PrivilegedTableDto; ...@@ -9,6 +9,7 @@ import at.tuwien.api.database.table.internal.PrivilegedTableDto;
import at.tuwien.endpoints.TableEndpoint; import at.tuwien.endpoints.TableEndpoint;
import at.tuwien.exception.*; import at.tuwien.exception.*;
import at.tuwien.gateway.MetadataServiceGateway; import at.tuwien.gateway.MetadataServiceGateway;
import at.tuwien.service.SchemaService;
import at.tuwien.service.TableService; import at.tuwien.service.TableService;
import at.tuwien.test.AbstractUnitTest; import at.tuwien.test.AbstractUnitTest;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
...@@ -54,6 +55,9 @@ public class TableEndpointUnitTest extends AbstractUnitTest { ...@@ -54,6 +55,9 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@MockBean @MockBean
private TableService tableService; private TableService tableService;
@MockBean
private SchemaService schemaService;
@MockBean @MockBean
private MetadataServiceGateway metadataServiceGateway; private MetadataServiceGateway metadataServiceGateway;
...@@ -89,6 +93,8 @@ public class TableEndpointUnitTest extends AbstractUnitTest { ...@@ -89,6 +93,8 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
.thenReturn(DATABASE_1_PRIVILEGED_DTO); .thenReturn(DATABASE_1_PRIVILEGED_DTO);
when(tableService.createTable(DATABASE_1_PRIVILEGED_DTO, TABLE_4_CREATE_INTERNAL_DTO)) when(tableService.createTable(DATABASE_1_PRIVILEGED_DTO, TABLE_4_CREATE_INTERNAL_DTO))
.thenReturn(TABLE_4_DTO); .thenReturn(TABLE_4_DTO);
when(schemaService.inspectTable(DATABASE_1_PRIVILEGED_DTO, TABLE_4_INTERNALNAME))
.thenReturn(TABLE_4_DTO);
/* test */ /* test */
final ResponseEntity<TableDto> response = tableEndpoint.create(DATABASE_1_ID, TABLE_4_CREATE_INTERNAL_DTO); final ResponseEntity<TableDto> response = tableEndpoint.create(DATABASE_1_ID, TABLE_4_CREATE_INTERNAL_DTO);
......
...@@ -53,7 +53,7 @@ public class AccessEndpointUnitTest extends AbstractUnitTest { ...@@ -53,7 +53,7 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
private MetadataMapper metadataMapper; private MetadataMapper metadataMapper;
@BeforeEach @BeforeEach
public void beforeAll() { public void beforeEach() {
genesis(); genesis();
} }
......
...@@ -22,6 +22,7 @@ public abstract class AbstractUnitTest extends BaseTest { ...@@ -22,6 +22,7 @@ public abstract class AbstractUnitTest extends BaseTest {
/* USER_4 */ /* USER_4 */
USER_5.setAccesses(new LinkedList<>()); USER_5.setAccesses(new LinkedList<>());
/* DATABASE 1 */ /* DATABASE 1 */
DATABASE_1.setOwner(USER_1);
DATABASE_1.setSubsets(new LinkedList<>()); DATABASE_1.setSubsets(new LinkedList<>());
DATABASE_1.setAccesses(new LinkedList<>(List.of(DATABASE_1_USER_1_READ_ACCESS, DATABASE_1_USER_2_WRITE_OWN_ACCESS, DATABASE_1_USER_3_WRITE_ALL_ACCESS))); DATABASE_1.setAccesses(new LinkedList<>(List.of(DATABASE_1_USER_1_READ_ACCESS, DATABASE_1_USER_2_WRITE_OWN_ACCESS, DATABASE_1_USER_3_WRITE_ALL_ACCESS)));
DATABASE_1_PRIVILEGED_DTO.setAccesses(new LinkedList<>(List.of(DATABASE_1_USER_1_READ_ACCESS_DTO, DATABASE_1_USER_2_WRITE_OWN_ACCESS_DTO, DATABASE_1_USER_3_WRITE_ALL_ACCESS_DTO))); DATABASE_1_PRIVILEGED_DTO.setAccesses(new LinkedList<>(List.of(DATABASE_1_USER_1_READ_ACCESS_DTO, DATABASE_1_USER_2_WRITE_OWN_ACCESS_DTO, DATABASE_1_USER_3_WRITE_ALL_ACCESS_DTO)));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment