WIP

- frontend still missing unique column constraints form

Makefile

@@ -46,6 +46,25 @@ build-docker:
 	docker compose build dbrepo-metadata-db
 	docker compose build --parallel
 
+build-docker-slow:
+	docker compose build dbrepo-analyse-service
+	docker compose build dbrepo-authentication-service
+	docker compose build dbrepo-broker-service
+	docker compose build dbrepo-metadata-db
+	docker compose build dbrepo-container-service
+	docker compose build dbrepo-database-service
+	docker compose build dbrepo-discovery-service
+	docker compose build dbrepo-gateway-service
+	docker compose build dbrepo-identifier-service
+	docker compose build dbrepo-metadata-service
+	docker compose build dbrepo-proxy
+	docker compose build dbrepo-query-service
+	docker compose build dbrepo-search-service
+	docker compose build dbrepo-semantics-service
+	docker compose build dbrepo-table-service
+	docker compose build dbrepo-ui
+	docker compose build dbrepo-user-service
+
 build-frontend:
 	yarn --cwd ./dbrepo-ui install --legacy-peer-deps
 	yarn --cwd ./dbrepo-ui run build

dbrepo-container-service/rest-service/src/main/java/at/tuwien/endpoints/ContainerEndpoint.java

@@ -245,7 +245,7 @@ public class ContainerEndpoint {
     })
     public ResponseEntity<?> delete(@NotNull @PathVariable("id") Long containerId,
                                     @NotNull Principal principal) throws ContainerNotFoundException,
-            ContainerStillRunningException, ContainerAlreadyRemovedException, DockerClientException {
+            ContainerStillRunningException, ContainerAlreadyRemovedException {
         log.debug("endpoint delete container, containerId={}, principal={}", containerId, principal);
         containerService.remove(containerId);
         return ResponseEntity.accepted()

dbrepo-container-service/services/src/main/java/at/tuwien/service/impl/ContainerServiceImpl.java

@@ -99,8 +99,8 @@ public class ContainerServiceImpl implements ContainerService {
                 response.getName() + ":/var/lib/mysql", availableTcpPort + ":" + image.get().getDefaultPort());
         log.trace("host config {}", hostConfig);
         final User user = userService.findByUsername(principal.getName());
-        container.setCreator(user);
-        container.setOwner(user);
+        container.setCreatedBy(user.getId());
+        container.setOwnedBy(user.getId());
         /* create the container */
         final CreateContainerResponse response1;
         try {

dbrepo-database-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java

@@ -148,7 +148,7 @@ public class DatabaseEndpoint {
                 principal);
         final Container container = containerService.find(containerId);
         final User user = userService.findByUsername(principal.getName());
-        if (!container.getOwner().getId().equals(user.getId())) {
+        if (!container.getOwner().equals(user)) {
             log.error("Failed to create database: not owner");
             throw new NotAllowedException(("Failed to create database: not owner"));
         }
@@ -195,7 +195,7 @@ public class DatabaseEndpoint {
                 databaseId, data, principal);
         final Database database = databaseService.findById(containerId, databaseId);
         final User user = userService.findByUsername(principal.getName());
-        if (!database.getOwner().getId().equals(user.getId())) {
+        if (!database.getOwner().equals(user)) {
             log.error("Failed to create database: not owner");
             throw new NotAllowedException(("Failed to create database: not owner"));
         }
@@ -236,7 +236,7 @@ public class DatabaseEndpoint {
                 databaseId, transferDto, principal);
         final Database database = databaseService.findById(containerId, databaseId);
         final User user = userService.findByUsername(principal.getName());
-        if (!database.getOwner().getId().equals(user.getId())) {
+        if (!database.getOwner().equals(user)) {
             log.error("Failed to create database: not owner");
             throw new NotAllowedException(("Failed to create database: not owner"));
         }
@@ -274,7 +274,7 @@ public class DatabaseEndpoint {
         log.debug("endpoint find database, containerId={}, databaseId={}", containerId, databaseId);
         final Database database = databaseService.findById(containerId, databaseId);
         final DatabaseDto dto = databaseMapper.databaseToDatabaseDto(database);
-        if (principal != null && database.getOwner().getUsername().equals(principal.getName())) {
+        if (principal != null && database.getOwner().equals(principal)) {
             /* only owner sees the access rights */ // TODO improve this by proper mapping
             final List<DatabaseAccess> accesses = accessService.list(databaseId);
             dto.setAccesses(accesses.stream()

dbrepo-database-service/services/src/main/java/at/tuwien/mapper/IdentifierMapper.java

@@ -5,7 +5,6 @@ import at.tuwien.api.identifier.IdentifierDto;
 import at.tuwien.entities.identifier.Identifier;
 import org.mapstruct.Mapper;
 
-
 @Mapper(componentModel = "spring")
 public interface IdentifierMapper {
 

dbrepo-database-service/services/src/main/java/at/tuwien/service/impl/MariaDbServiceImpl.java

@@ -133,8 +133,9 @@ public class MariaDbServiceImpl extends HibernateConnector implements DatabaseSe
         database.setId(containerId);
         database.setContainer(container);
         final User owner = userService.findByUsername(principal.getName());
-        database.setCreator(owner);
-        database.setOwner(owner);
+        database.setOwnedBy(owner.getId());
+        database.setCreatedBy(owner.getId());
+        database.setContactPerson(owner.getId());
         database.setExchangeName("dbrepo." + database.getInternalName());
         final ComboPooledDataSource dataSource = getDataSource(container.getImage(), container, root);
         try {
@@ -185,7 +186,7 @@ public class MariaDbServiceImpl extends HibernateConnector implements DatabaseSe
         final Database entity = findById(containerId, databaseId);
         final User user = userService.findByUsername(transferDto.getUsername());
         /* update in metadata database */
-        entity.setOwner(user);
+        entity.setOwnedBy(user.getId());
         databaseIdxRepository.save(databaseMapper.databaseToDatabaseDto(entity));
         log.info("Updated database in elastic search with id {}", entity.getId());
         return entity;

dbrepo-identifier-service/rest-service/src/main/java/at/tuwien/endpoints/IdentifierEndpoint.java

@@ -174,7 +174,7 @@ public class IdentifierEndpoint {
     })
     public ResponseEntity<IdentifierDto> update(@NotNull @PathVariable("id") Long id,
                                                 @NotNull @Valid @RequestBody IdentifierDto data)
-            throws IdentifierPublishingNotAllowedException, IdentifierNotFoundException, IdentifierRequestException {
+            throws IdentifierNotFoundException, IdentifierRequestException {
         log.debug("endpoint update identifier, id={}, data={}", id, data);
         final Identifier identifier = identifierService.update(id, data);
         return ResponseEntity.accepted()

dbrepo-identifier-service/services/src/main/java/at/tuwien/service/impl/IdentifierServiceImpl.java

@@ -116,7 +116,7 @@ public class IdentifierServiceImpl implements IdentifierService {
         tmp.setContainerId(data.getCid());
         tmp.setDatabaseId(data.getDbid());
         final User creator = userService.findByUsername(principal.getName());
-        tmp.setCreator(creator);
+        tmp.setCreatedBy(creator.getId());
         tmp.setCreators(List.of());
         if (data.getType().equals(IdentifierTypeDto.SUBSET)) {
             log.debug("identifier describes a subset");
@@ -136,7 +136,7 @@ public class IdentifierServiceImpl implements IdentifierService {
                 .map(c -> {
                     final Creator creatorDto = identifierMapper.creatorCreateDtoToCreator(c);
                     creatorDto.setPid(entity.getId());
-                    creatorDto.setCreator(creator);
+                    creatorDto.setCreatedBy(creator.getId());
                     return creatorDto;
                 })
                 .collect(Collectors.toList()));
@@ -146,7 +146,7 @@ public class IdentifierServiceImpl implements IdentifierService {
                     .forEach(r -> {
                         final RelatedIdentifier id = identifierMapper.relatedIdentifierCreateDtoToRelatedIdentifier(r);
                         id.setIid(entity.getId());
-                        id.setCreator(creator);
+                        id.setCreatedBy(creator.getId());
                         final RelatedIdentifier relatedIdentifier = relatedIdentifierRepository.save(id);
                         log.debug("identifier add related with id {}", relatedIdentifier.getId());
                         entity.getRelated().add(relatedIdentifier);

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/ViewBriefDto.java

@@ -10,6 +10,7 @@ import lombok.*;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.time.Instant;
+import java.util.UUID;
 
 @Getter
 @Setter
@@ -52,7 +53,7 @@ public class ViewBriefDto {
     private Instant created;
 
     @JsonIgnore
-    private String createdBy;
+    private UUID createdBy;
 
     @NotNull
     private UserDto creator;

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/ViewDto.java

@@ -11,6 +11,7 @@ import org.springframework.data.elasticsearch.annotations.Document;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.time.Instant;
+import java.util.UUID;
 
 @Getter
 @Setter
@@ -57,7 +58,7 @@ public class ViewDto {
     private Instant created;
 
     @JsonIgnore
-    private String createdBy;
+    private UUID createdBy;
 
     @NotNull
     private UserDto creator;

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/QueryBriefDto.java

@@ -13,6 +13,7 @@ import lombok.*;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.time.Instant;
+import java.util.UUID;
 
 
 @Getter
@@ -35,7 +36,7 @@ public class QueryBriefDto {
 
     @JsonIgnore
     @NotNull(message = "created by is required")
-    private String createdBy;
+    private UUID createdBy;
 
     @NotNull(message = "creator is required")
     private UserDto creator;

dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/QueryDto.java

@@ -5,15 +5,13 @@ import at.tuwien.api.user.UserDto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.time.Instant;
+import java.util.UUID;
 
 
 @Getter
@@ -37,7 +35,7 @@ public class QueryDto {
     @JsonIgnore
     @EqualsAndHashCode.Exclude
     @NotNull(message = "created by is required")
-    private String createdBy;
+    private UUID createdBy;
 
     @NotNull(message = "creator is required")
     private UserDto creator;

dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java

@@ -6,12 +6,14 @@ import at.tuwien.entities.user.User;
 import com.github.dockerjava.api.model.HealthCheck;
 import lombok.*;
 import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Type;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
 import java.time.Instant;
+import java.util.UUID;
 
 @Data
 @Entity
@@ -31,15 +33,25 @@ public class Container {
     @Column(updatable = false, nullable = false)
     private Long id;
 
+    @ToString.Exclude
+    @Column(name = "createdBy", nullable = false, columnDefinition = "VARCHAR(36)")
+    @Type(type = "uuid-char")
+    private UUID createdBy;
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     @JoinColumns({
-            @JoinColumn(name = "createdBy", referencedColumnName = "ID")
+            @JoinColumn(name = "createdBy", referencedColumnName = "ID", insertable = false, updatable = false)
     })
     private User creator;
 
+    @ToString.Exclude
+    @Column(name = "ownedBy", nullable = false, columnDefinition = "VARCHAR(36)")
+    @Type(type = "uuid-char")
+    private UUID ownedBy;
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     @JoinColumns({
-            @JoinColumn(name = "ownedBy", referencedColumnName = "ID")
+            @JoinColumn(name = "ownedBy", referencedColumnName = "ID", insertable = false, updatable = false)
     })
     private User owner;
 

dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java

@@ -16,6 +16,7 @@ import javax.persistence.Entity;
 import java.io.Serializable;
 import java.time.Instant;
 import java.util.List;
+import java.util.UUID;
 
 @Data
 @Entity
@@ -34,15 +35,26 @@ public class Database implements Serializable {
     @Column(updatable = false, nullable = false)
     private Long id;
 
+    @ToString.Exclude
+    @Column(name = "created_by", nullable = false, columnDefinition = "VARCHAR(36)")
+    @Type(type = "uuid-char")
+    private UUID createdBy;
+
+    @Type(type = "uuid-char")
     @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     @JoinColumns({
-            @JoinColumn(name = "created_by", referencedColumnName = "ID")
+            @JoinColumn(name = "created_by", referencedColumnName = "ID", insertable = false, updatable = false)
     })
     private User creator;
 
-    @ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+    @ToString.Exclude
+    @Column(name = "owned_by", nullable = false, columnDefinition = "VARCHAR(36)")
+    @Type(type = "uuid-char")
+    private UUID ownedBy;
+
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     @JoinColumns({
-            @JoinColumn(name = "owned_by", referencedColumnName = "ID")
+            @JoinColumn(name = "owned_by", referencedColumnName = "ID", insertable = false, updatable = false)
     })
     private User owner;
 
@@ -66,9 +78,15 @@ public class Database implements Serializable {
     @Column(columnDefinition = "TEXT")
     private String description;
 
+    @ToString.Exclude
+    @Column(name = "contact_person", nullable = false, columnDefinition = "VARCHAR(36)")
+    @Type(type = "uuid-char")
+    private UUID contactPerson;
+
+    @Type(type = "uuid-char")
     @ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
     @JoinColumns({
-            @JoinColumn(name = "contact_person", referencedColumnName = "ID")
+            @JoinColumn(name = "contact_person", referencedColumnName = "ID", updatable = false, insertable = false)
     })
     private User contact;
 

dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/DatabaseAccess.java

@@ -2,6 +2,7 @@ package at.tuwien.entities.database;
 
 import at.tuwien.entities.user.User;
 import lombok.*;
+import org.hibernate.annotations.Type;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
@@ -21,6 +22,7 @@ import java.util.UUID;
 public class DatabaseAccess {
 
     @Id
+    @Type(type = "uuid-char")
     @EqualsAndHashCode.Include
     @Column(name = "user_id", updatable = false, columnDefinition = "VARCHAR(36)")
     private UUID huserid;

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

@@ -5,6 +5,7 @@ import at.tuwien.entities.user.User;
 import lombok.*;
 import net.sf.jsqlparser.statement.select.FromItem;
 import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Type;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.elasticsearch.annotations.Document;
@@ -13,6 +14,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 import javax.persistence.*;
 import java.time.Instant;
 import java.util.List;
+import java.util.UUID;
 
 @Data
 @Entity
@@ -40,9 +42,14 @@ public class View {
     @EqualsAndHashCode.Include
     private Long vdbid;
 
+    @ToString.Exclude
+    @Column(name = "createdBy", nullable = false, columnDefinition = "VARCHAR(36)")
+    @Type(type = "uuid-char")
+    private UUID createdBy;
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     @JoinColumns({
-            @JoinColumn(name = "createdBy", referencedColumnName = "ID")
+            @JoinColumn(name = "createdBy", referencedColumnName = "ID", insertable = false, updatable = false)
     })
     private User creator;
 

dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java

@@ -7,6 +7,7 @@ import at.tuwien.entities.user.User;
 import lombok.*;
 import net.sf.jsqlparser.statement.select.FromItem;
 import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Type;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.elasticsearch.annotations.Document;
@@ -41,9 +42,14 @@ public class Table {
     @EqualsAndHashCode.Include
     private Long tdbid;
 
+    @ToString.Exclude
+    @Column(name = "createdBy", nullable = false, columnDefinition = "VARCHAR(36)")
+    @Type(type = "uuid-char")
+    private UUID createdBy;
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     @JoinColumns({
-            @JoinColumn(name = "createdBy", referencedColumnName = "ID", columnDefinition = "VARCHAR(36)")
+            @JoinColumn(name = "createdBy", referencedColumnName = "ID", updatable = false, insertable = false)
     })
     private User creator;
 

dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java

@@ -6,6 +6,7 @@ import at.tuwien.entities.user.User;
 import lombok.*;
 import net.sf.jsqlparser.statement.select.SelectItem;
 import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Type;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
@@ -13,6 +14,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 import javax.persistence.*;
 import java.time.Instant;
 import java.util.List;
+import java.util.UUID;
 
 @Data
 @Entity
@@ -58,9 +60,14 @@ public class TableColumn implements Comparable<TableColumn> {
     })
     private Table table;
 
+    @ToString.Exclude
+    @Column(name = "createdBy", nullable = false, columnDefinition = "VARCHAR(36)")
+    @Type(type = "uuid-char")
+    private UUID createdBy;
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     @JoinColumns({
-            @JoinColumn(name = "createdBy", referencedColumnName = "ID")
+            @JoinColumn(name = "createdBy", referencedColumnName = "ID", insertable = false, updatable = false)
     })
     private User creator;
 

dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Creator.java

@@ -3,12 +3,14 @@ package at.tuwien.entities.identifier;
 import at.tuwien.entities.user.User;
 import lombok.*;
 import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Type;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
 import java.time.Instant;
+import java.util.UUID;
 
 @Data
 @Entity
@@ -54,9 +56,14 @@ public class Creator {
     @CreatedDate
     private Instant created;
 
+    @ToString.Exclude
+    @Column(name = "createdBy", nullable = false, columnDefinition = "VARCHAR(36)")
+    @Type(type = "uuid-char")
+    private UUID createdBy;
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     @JoinColumns({
-            @JoinColumn(name = "createdBy", referencedColumnName = "ID")
+            @JoinColumn(name = "createdBy", referencedColumnName = "ID", insertable = false, updatable = false)
     })
     private User creator;
 

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

@@ -6,6 +6,7 @@ import at.tuwien.entities.database.License;
 import at.tuwien.entities.user.User;
 import lombok.*;
 import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Type;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
@@ -15,6 +16,7 @@ import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.time.Instant;
 import java.util.List;
+import java.util.UUID;
 
 @Data
 @Entity
@@ -44,9 +46,14 @@ public class Identifier implements Serializable {
     @Column(name = "qid")
     private Long queryId;
 
+    @ToString.Exclude
+    @Column(name = "createdBy", nullable = false, columnDefinition = "VARCHAR(36)")
+    @Type(type = "uuid-char")
+    private UUID createdBy;
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
     @JoinColumns({
-            @JoinColumn(name = "createdBy", referencedColumnName = "ID")
+            @JoinColumn(name = "createdBy", referencedColumnName = "ID", insertable = false, updatable = false)
     })
     private User creator;