Merge branch 'dev' into 241-fix-junit-pipeline

fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDate.java

@@ -36,7 +36,7 @@ public class ContainerImageDate {
 
     @org.springframework.data.annotation.Transient
     @ToString.Exclude
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.DETACH)
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
     @JoinColumn(name = "iid", insertable = false, updatable = false)
     private ContainerImage image;
 

fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/View.java

@@ -46,7 +46,7 @@ public class View {
     private User creator;
 
     @org.springframework.data.annotation.Transient
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.DETACH)
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
     @JoinColumn(name = "vdbid", insertable = false, updatable = false)
     private Database database;
 

fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/Concept.java

@@ -29,7 +29,7 @@ public class Concept {
 
     @org.springframework.data.annotation.Transient
     @ToString.Exclude
-    @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.DETACH)
+    @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
     @JoinTable(name = "mdb_columns_concepts",
             joinColumns = @JoinColumn(name = "uri"),
             inverseJoinColumns = {

fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java

@@ -71,7 +71,7 @@ public class Identifier {
     @Enumerated(EnumType.STRING)
     private LanguageType language;
 
-    @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.DETACH)
+    @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
     @JoinColumns({
             @JoinColumn(name = "License", referencedColumnName = "identifier")
     })
@@ -118,7 +118,7 @@ public class Identifier {
     @Enumerated(EnumType.STRING)
     private VisibilityType visibility = VisibilityType.SELF;
 
-    @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.DETACH)
+    @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
     @JoinColumns({
             @JoinColumn(name = "iid", referencedColumnName = "id", insertable = false, updatable = false)
     })

fda-query-service/rest-service/src/main/java/at/tuwien/endpoint/QueryEndpoint.java

@@ -37,7 +37,7 @@ public class QueryEndpoint extends AbstractEndpoint {
         this.storeService = storeService;
     }
 
-    @PutMapping
+    @PostMapping
     @Transactional(readOnly = true)
     @Timed(value = "query.execute", description = "Time needed to execute a query")
     @Operation(summary = "Execute query", security = @SecurityRequirement(name = "bearerAuth"))

fda-ui/components/query/Results.vue

@@ -62,7 +62,7 @@ export default {
     async executeFirstTime (parent, sql) {
       this.loading = true
       try {
-        const res = await this.$axios.put(this.executeUrl, { statement: sql }, this.config)
+        const res = await this.$axios.post(this.executeUrl, { statement: sql }, this.config)
         console.debug('query result', res.data)
         this.$toast.success('Successfully executed query')
         this.mapResults(res.data)