From 30cdedfd67e877eeaac228485de28143a10a8174 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Sat, 12 Oct 2024 21:20:12 +0200
Subject: [PATCH] WIP
---
.../java/at/tuwien/entities/database/Database.java | 3 ++-
.../at/tuwien/service/ViewServicePersistenceTest.java | 4 ++++
helm/dbrepo/files/system.json | 10 +++-------
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java
index 2e154b8697..6db93855c3 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java
@@ -122,7 +122,8 @@ public class Database implements Serializable {
private List<Table> tables;
@ToString.Exclude
- @OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE, CascadeType.PERSIST}, mappedBy = "database", orphanRemoval = true)
+ @OrderBy("id DESC")
+ @OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.ALL, CascadeType.PERSIST}, mappedBy = "database", orphanRemoval = true)
private List<View> views;
@ToString.Exclude
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java
index 3ed06bfd7c..63dc42b662 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java
@@ -24,6 +24,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.when;
@@ -91,6 +92,9 @@ public class ViewServicePersistenceTest extends AbstractUnitTest {
/* test */
viewService.delete(VIEW_1);
+ assertThrows(ViewNotFoundException.class, () -> {
+ viewService.findById(DATABASE_1, VIEW_1_ID);
+ });
}
}
diff --git a/helm/dbrepo/files/system.json b/helm/dbrepo/files/system.json
index c829e57d1a..52bf6d0671 100644
--- a/helm/dbrepo/files/system.json
+++ b/helm/dbrepo/files/system.json
@@ -1292,7 +1292,7 @@
{
"matcher": {
"id": "byName",
- "options": "auth-service:8080"
+ "options": "auth-service:9000"
},
"properties": [
{
@@ -1442,10 +1442,6 @@
{
"color": "green",
"value": null
- },
- {
- "color": "red",
- "value": 80
}
]
},
@@ -1455,7 +1451,7 @@
{
"matcher": {
"id": "byName",
- "options": "auth-service:8080"
+ "options": "auth-service:9000"
},
"properties": [
{
@@ -1803,7 +1799,7 @@
"type": "timeseries"
}
],
- "refresh": "5s",
+ "refresh": "1m",
"schemaVersion": 39,
"tags": [
"provisioned",
--
GitLab