From f50eef509e375e94f4eada17b69acc8957fb2136 Mon Sep 17 00:00:00 2001 From: Martin Weise <martin.weise@tuwien.ac.at> Date: Fri, 28 May 2021 19:40:30 +0200 Subject: [PATCH] closes #74 Former-commit-id: c6a738d824b776effccf311d7669a455b27f9c7a --- .../src/main/java/at/tuwien/service/DatabaseService.java | 2 ++ .../src/main/java/at/tuwien/service/PostgresService.java | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fda-database-service/services/src/main/java/at/tuwien/service/DatabaseService.java b/fda-database-service/services/src/main/java/at/tuwien/service/DatabaseService.java index 83ad7a6ae0..39e913d1be 100644 --- a/fda-database-service/services/src/main/java/at/tuwien/service/DatabaseService.java +++ b/fda-database-service/services/src/main/java/at/tuwien/service/DatabaseService.java @@ -11,6 +11,7 @@ import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.transaction.Transactional; import java.util.List; import java.util.Optional; @@ -79,6 +80,7 @@ public class DatabaseService { databaseRepository.deleteById(databaseId); } + @Transactional public Database create(DatabaseCreateDto createDto) throws ImageNotSupportedException, DatabaseConnectionException, DatabaseMalformedException, ContainerNotFoundException { log.debug("get container {}", createDto.getContainerId()); diff --git a/fda-database-service/services/src/main/java/at/tuwien/service/PostgresService.java b/fda-database-service/services/src/main/java/at/tuwien/service/PostgresService.java index c77fc7605b..5021469f79 100644 --- a/fda-database-service/services/src/main/java/at/tuwien/service/PostgresService.java +++ b/fda-database-service/services/src/main/java/at/tuwien/service/PostgresService.java @@ -31,14 +31,14 @@ public class PostgresService extends JdbcConnector { try { connection = open(URL, postgresProperties); } catch (SQLException e) { - log.error("Could not connect to the database container, is it running from Docker container? IT DOES NOT WORK FROM IDE! URL: {} Params: {}", URL, postgresProperties); + log.error("Could not connect to the database container, is it running from Docker container? URL: {} Params: {}", URL, postgresProperties); throw new DatabaseConnectionException("Could not connect to the database container, is it running?", e); } try { final PreparedStatement statement = getCreateDatabaseStatement(connection, database); statement.execute(); } catch (SQLException e) { - log.error("The SQL statement seems to contain invalid syntax"); + log.error("The SQL statement seems to contain invalid syntax or database already exists"); throw new DatabaseMalformedException("The SQL statement seems to contain invalid syntax", e); } } @@ -51,14 +51,14 @@ public class PostgresService extends JdbcConnector { try { connection = open(URL, postgresProperties); } catch (SQLException e) { - log.error("Could not connect to the database container, is it running from Docker container? IT DOES NOT WORK FROM IDE! URL: {} Params: {}", URL, postgresProperties); + log.error("Could not connect to the database container, is it running from Docker container? URL: {} Params: {}", URL, postgresProperties); throw new DatabaseConnectionException("Could not connect to the database container, is it running?", e); } try { final PreparedStatement statement = getDeleteDatabaseStatement(connection, database); statement.execute(); } catch (SQLException e) { - log.error("The SQL statement seems to contain invalid syntax or already exists"); + log.error("The SQL statement seems to contain invalid syntax or database does not exist"); throw new DatabaseMalformedException("The SQL statement seems to contain invalid syntax or already exists", e); } } -- GitLab