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

Reverting changes on join DMP <-> EntityDoiEntity for now in order for the app to be able to run

This commit is contained in:
Thomas Georgios Giannos 2023-10-19 16:52:41 +03:00
parent 16604a8a50
commit 727702023f
6 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dmp-backend/core/src/main/java/eu/eudat/data/EntityDoiEntity.java
View File

@ -4,6 +4,7 @@ import eu.eudat.commons.enums.EntityType;
import eu.eudat.commons.enums.IsActive;
import eu.eudat.data.converters.DateToUTCConverter;
import eu.eudat.data.converters.enums.IsActiveConverter;
import eu.eudat.data.old.DMP;
import jakarta.persistence.*;
import java.time.Instant;
@ -54,8 +55,9 @@ public class EntityDoiEntity {
public static final String _isActive = "isActive";
@Column(name = "entity_id", columnDefinition = "BINARY(16)")
private UUID entityId;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "entity_id", nullable = false)
private DMP entityId;
public static final String _entityId = "entityId";
@ -115,11 +117,11 @@ public class EntityDoiEntity {
this.isActive = isActive;
}
public UUID getEntityId() {
public DMP getEntityId() {
return entityId;
}
public void setEntityId(UUID entityId) {
public void setEntityId(DMP entityId) {
this.entityId = entityId;
}

3
dmp-backend/core/src/main/java/eu/eudat/data/old/DMP.java
View File

@ -183,8 +183,7 @@ public class DMP implements DataEntity<DMP, UUID> {
@Convert(converter = DateToUTCConverter.class)
private Date publishedAt;
// @OneToMany(mappedBy = "entityId", fetch = FetchType.LAZY)
@Transient
@OneToMany(mappedBy = "entityId", fetch = FetchType.LAZY)
private Set<EntityDoiEntity> dois;
@ManyToOne(fetch = FetchType.LAZY)

2
dmp-backend/core/src/main/java/eu/eudat/model/builder/EntityDoiBuilder.java
View File

@ -48,7 +48,7 @@ public class EntityDoiBuilder extends BaseBuilder<EntityDoi, EntityDoiEntity> {
if (fields.hasField(this.asIndexer(EntityDoi._doi)))
m.setDoi(d.getDoi());
if (fields.hasField(this.asIndexer(EntityDoi._entityId)))
m.setEntityId(d.getEntityId());
m.setEntityId(d.getEntityId().getId());
if (fields.hasField(this.asIndexer(EntityDoi._entityType)))
m.setEntityType(d.getEntityType());
if (fields.hasField(this.asIndexer(EntityDoi._repositoryId)))

3
dmp-backend/core/src/main/java/eu/eudat/query/EntityDoiQuery.java
View File

@ -5,6 +5,7 @@ import eu.eudat.commons.enums.EntityType;
import eu.eudat.commons.enums.IsActive;
import eu.eudat.commons.scope.user.UserScope;
import eu.eudat.data.EntityDoiEntity;
import eu.eudat.data.old.DMP;
import gr.cite.commons.web.authz.service.AuthorizationService;
import gr.cite.tools.data.query.FieldResolver;
import gr.cite.tools.data.query.QueryBase;
@ -185,7 +186,7 @@ public class EntityDoiQuery extends QueryBase<EntityDoiEntity> {
item.setId(QueryBase.convertSafe(tuple, columns, EntityDoiEntity._id, UUID.class));
item.setDoi(QueryBase.convertSafe(tuple, columns, EntityDoiEntity._doi, String.class));
item.setRepositoryId(QueryBase.convertSafe(tuple, columns, EntityDoiEntity._repositoryId, String.class));
item.setEntityId(QueryBase.convertSafe(tuple, columns, EntityDoiEntity._entityId, UUID.class));
item.setEntityId(QueryBase.convertSafe(tuple, columns, EntityDoiEntity._entityId, DMP.class));
item.setEntityType(QueryBase.convertSafe(tuple, columns, EntityDoiEntity._entityType, EntityType.class));
item.setCreatedAt(QueryBase.convertSafe(tuple, columns, EntityDoiEntity._createdAt, Instant.class));
item.setUpdatedAt(QueryBase.convertSafe(tuple, columns, EntityDoiEntity._updatedAt, Instant.class));

6
dmp-backend/core/src/main/java/eu/eudat/service/EntityDoiServiceImpl.java
View File

@ -8,6 +8,7 @@ import eu.eudat.commons.enums.IsActive;
import eu.eudat.convention.ConventionService;
import eu.eudat.data.DescriptionTemplateTypeEntity;
import eu.eudat.data.EntityDoiEntity;
import eu.eudat.data.old.DMP;
import eu.eudat.errorcode.ErrorThesaurusProperties;
import eu.eudat.event.DescriptionTemplateTypeTouchedEvent;
import eu.eudat.event.EntityDoiTouchedEvent;
@ -42,6 +43,7 @@ import javax.management.InvalidApplicationException;
import java.time.Instant;
import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.UUID;
public class EntityDoiServiceImpl implements EntityDoiService {
@ -112,7 +114,9 @@ public class EntityDoiServiceImpl implements EntityDoiService {
}
data.setEntityType(EntityType.DMP);
data.setEntityId(model.getEntityId());
DMP dmp = new DMP();
dmp.setId(model.getEntityId());
data.setEntityId(dmp);
data.setRepositoryId(model.getRepositoryId());
data.setDoi(model.getDoi());
data.setUpdatedAt(Instant.now());

2
dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
View File

@ -2538,7 +2538,7 @@ public class DataManagementPlanManager {
doiEntity.setRepositoryId(depositRequest.getRepositoryId());
doiEntity.setCreatedAt(Instant.now());
doiEntity.setUpdatedAt(Instant.now());
doiEntity.setEntityId(dmp.getId());
doiEntity.setEntityId(dmp);
//TODO: Save doi
// apiContext.getOperationsContext().getDatabaseRepository().getEntityDoiDao().createOrUpdate(doiEntity);