diff --git a/src/org/kar/archidata/dataAccess/addOn/AddOnDataJson.java b/src/org/kar/archidata/dataAccess/addOn/AddOnDataJson.java index deac4b2..2f3a75d 100644 --- a/src/org/kar/archidata/dataAccess/addOn/AddOnDataJson.java +++ b/src/org/kar/archidata/dataAccess/addOn/AddOnDataJson.java @@ -200,7 +200,7 @@ public class AddOnDataJson implements DataAccessAddOn { } } data.covers.add(remoteKey); - DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName)); + DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));// TODO: ,new OverrideFieldName("covers", column)); } public static void addLink(final Class clazz, final UUID id, final String column, final UUID remoteKey) diff --git a/src/org/kar/archidata/dataAccess/addOn/model/LinkTableLongLong.java b/src/org/kar/archidata/dataAccess/addOn/model/LinkTableLongLong.java index b5ef1f6..4b458b5 100644 --- a/src/org/kar/archidata/dataAccess/addOn/model/LinkTableLongLong.java +++ b/src/org/kar/archidata/dataAccess/addOn/model/LinkTableLongLong.java @@ -1,11 +1,11 @@ package org.kar.archidata.dataAccess.addOn.model; -import org.kar.archidata.model.GenericData; +import org.kar.archidata.model.UUIDGenericDataSoftDelete; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Column; -public class LinkTableLongLong extends GenericData { +public class LinkTableLongLong extends UUIDGenericDataSoftDelete { public LinkTableLongLong() { // nothing to do... } diff --git a/src/org/kar/archidata/dataAccess/addOn/model/LinkTableLongUUID.java b/src/org/kar/archidata/dataAccess/addOn/model/LinkTableLongUUID.java index 8f76c49..91cf667 100644 --- a/src/org/kar/archidata/dataAccess/addOn/model/LinkTableLongUUID.java +++ b/src/org/kar/archidata/dataAccess/addOn/model/LinkTableLongUUID.java @@ -2,12 +2,12 @@ package org.kar.archidata.dataAccess.addOn.model; import java.util.UUID; -import org.kar.archidata.model.GenericData; +import org.kar.archidata.model.UUIDGenericDataSoftDelete; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Column; -public class LinkTableLongUUID extends GenericData { +public class LinkTableLongUUID extends UUIDGenericDataSoftDelete { public LinkTableLongUUID() { // nothing to do... } diff --git a/src/org/kar/archidata/dataAccess/addOn/model/LinkTableUUIDLong.java b/src/org/kar/archidata/dataAccess/addOn/model/LinkTableUUIDLong.java index 944f20f..3da8c2f 100644 --- a/src/org/kar/archidata/dataAccess/addOn/model/LinkTableUUIDLong.java +++ b/src/org/kar/archidata/dataAccess/addOn/model/LinkTableUUIDLong.java @@ -2,12 +2,12 @@ package org.kar.archidata.dataAccess.addOn.model; import java.util.UUID; -import org.kar.archidata.model.GenericData; +import org.kar.archidata.model.UUIDGenericDataSoftDelete; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Column; -public class LinkTableUUIDLong extends GenericData { +public class LinkTableUUIDLong extends UUIDGenericDataSoftDelete { public LinkTableUUIDLong() { // nothing to do... } diff --git a/src/org/kar/archidata/dataAccess/addOn/model/LinkTableUUIDUUID.java b/src/org/kar/archidata/dataAccess/addOn/model/LinkTableUUIDUUID.java index 0f2b396..81173e4 100644 --- a/src/org/kar/archidata/dataAccess/addOn/model/LinkTableUUIDUUID.java +++ b/src/org/kar/archidata/dataAccess/addOn/model/LinkTableUUIDUUID.java @@ -2,12 +2,12 @@ package org.kar.archidata.dataAccess.addOn.model; import java.util.UUID; -import org.kar.archidata.model.GenericData; +import org.kar.archidata.model.UUIDGenericDataSoftDelete; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Column; -public class LinkTableUUIDUUID extends GenericData { +public class LinkTableUUIDUUID extends UUIDGenericDataSoftDelete { public LinkTableUUIDUUID() { // nothing to do... } diff --git a/src/org/kar/archidata/model/User.java b/src/org/kar/archidata/model/User.java index 74e710a..aef54f8 100644 --- a/src/org/kar/archidata/model/User.java +++ b/src/org/kar/archidata/model/User.java @@ -18,13 +18,13 @@ import java.sql.Timestamp; import java.util.List; import org.kar.archidata.annotation.DataIfNotExists; +import org.kar.archidata.annotation.DataJson; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Column; -import jakarta.persistence.FetchType; -import jakarta.persistence.ManyToMany; import jakarta.persistence.Table; import jakarta.ws.rs.DefaultValue; @@ -47,7 +47,8 @@ public class User extends GenericDataSoftDelete { @Column(nullable = false) public boolean removed = false; - @ManyToMany(fetch = FetchType.LAZY, targetEntity = Data.class) + @Schema(description = "List of Id of the specific covers") + @DataJson(targetEntity = Data.class) public List covers; @Override