From a978b4ef7849ed4005f8d84b45b8606a7e2b7925 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Wed, 25 Dec 2024 23:34:30 +0100
Subject: [PATCH] Mapper fix
---
.../src/main/java/at/tuwien/mapper/MetadataMapper.java | 5 ++---
.../src/main/java/at/tuwien/endpoints/TableEndpoint.java | 3 ++-
.../main/java/at/tuwien/service/impl/TableServiceImpl.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
index 98c77c7b0d..f63c387c98 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
@@ -483,7 +483,6 @@ public interface MetadataMapper {
@Mappings({
@Mapping(target = "databaseId", source = "tdbid"),
- @Mapping(target = "isPublic", source = "database.isPublic"),
})
TableBriefDto tableToTableBriefDto(Table data);
@@ -535,7 +534,7 @@ public interface MetadataMapper {
.internalName(data.getInternalName())
.owner(userToUserBriefDto(data.getOwner()))
.tdbid(data.getTdbid())
- .isPublic(data.getDatabase().getIsPublic())
+ .isPublic(data.getIsPublic())
.isSchemaPublic(data.getIsSchemaPublic())
.isVersioned(true)
.description(data.getDescription())
@@ -720,7 +719,7 @@ public interface MetadataMapper {
@Mappings({
@Mapping(target = "tableId", source = "table.id"),
@Mapping(target = "databaseId", source = "table.database.id"),
- @Mapping(target = "isPublic", source = "table.database.isPublic"),
+ @Mapping(target = "isPublic", source = "table.isSchemaPublic"),
@Mapping(target = "description", source = "description"),
@Mapping(target = "table", ignore = true),
@Mapping(target = "views", ignore = true)
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
index 3dbc450735..a517c39d10 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
@@ -403,7 +403,8 @@ public class TableEndpoint {
@NotNull Principal principal) throws NotAllowedException,
DataServiceException, DataServiceConnectionException, DatabaseNotFoundException, TableNotFoundException,
SearchServiceException, SearchServiceConnectionException {
- log.debug("endpoint update table, databaseId={}, data.is_public={}", databaseId, data.getIsPublic());
+ log.debug("endpoint update table, databaseId={}, data.is_public={}, data.is_schema_public={}", databaseId,
+ data.getIsPublic(), data.getIsSchemaPublic());
final Table table = tableService.findById(databaseId, tableId);
if (!table.getOwner().equals(principal)) {
log.error("Failed to update table: not owner");
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java
index 4a4a9ccaca..57b546fcea 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java
@@ -220,8 +220,8 @@ public class TableServiceImpl implements TableService {
}
final Table tableEntity = optional.get();
tableEntity.setIsPublic(data.getIsPublic());
- tableEntity.setDescription(data.getDescription());
tableEntity.setIsSchemaPublic(data.getIsSchemaPublic());
+ tableEntity.setDescription(data.getDescription());
final Database database = databaseRepository.save(table.getDatabase());
/* update in search service */
searchServiceGateway.update(database);
--
GitLab