MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

This commit is contained in:
Sofia Papacharalampous 2024-05-08 17:46:06 +03:00
parent c263ab1564 ef3d54d6a3
commit ebb35ad41c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/core/src/main/java/org/opencdmp/data/TagEntity.java
View File

@ -19,7 +19,7 @@ public class TagEntity extends TenantScopedBaseEntity {
@Column(name = "\"label\"", length = TagEntity._labelLength, nullable = false) @Column(name = "\"label\"", length = TagEntity._labelLength, nullable = false)
private String label; private String label;
public static final String _label = "label"; public static final String _label = "label";
public static final int _labelLength = 250; public static final int _labelLength = 1024;
@Column(name = "is_active", nullable = false) @Column(name = "is_active", nullable = false)
@Convert(converter = IsActiveConverter.class) @Convert(converter = IsActiveConverter.class)

2
dmp-db-scema/updates/00.01.015_addTag.sql
View File

@ -7,7 +7,7 @@ BEGIN
CREATE TABLE public."Tag" CREATE TABLE public."Tag"
( (
id uuid NOT NULL, id uuid NOT NULL,
label character varying(250) COLLATE pg_catalog."default" NOT NULL, label character varying(1024) COLLATE pg_catalog."default" NOT NULL,
created_by uuid, created_by uuid,
is_active smallint NOT NULL, is_active smallint NOT NULL,
created_at timestamp without time zone NOT NULL, created_at timestamp without time zone NOT NULL,

2
dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/TagMigrationService.java
View File

@ -58,7 +58,7 @@ public class TagMigrationService {
for (Dataset item : items) { for (Dataset item : items) {
List<eu.old.eudat.elastic.entities.Dataset> found = elasticDatasets.stream().filter(x -> item.getId().toString().equals(x.getId())).toList(); List<eu.old.eudat.elastic.entities.Dataset> found = elasticDatasets.stream().filter(x -> item.getId().toString().equals(x.getId())).toList();
if (found.isEmpty()) { if (found.isEmpty()) {
logger.error("No dataset with id {} found on elastic search. Skipping tag migration for this dataset", item.getId()); //logger.error("No dataset with id {} found on elastic search. Skipping tag migration for this dataset", item.getId());
continue; continue;
} }
eu.old.eudat.elastic.entities.Dataset elasticDataset = found.getFirst(); eu.old.eudat.elastic.entities.Dataset elasticDataset = found.getFirst();