LibreCCM
/
scientificcms
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some bugfixes for imports

master
Jens Pelzetter 2022-12-12 21:20:16 +01:00
parent 51d77b998a
commit 8f369ba21a
5 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sci-types-department/src/main/java/org/scientificcms/contenttypes/scidepartment/ContactImExporter.java
View File

@ -1,5 +1,7 @@
package org.scientificcms.contenttypes.scidepartment;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.libreccm.imexport.AbstractEntityImExporter;
import org.libreccm.imexport.Processes;
import org.librecms.assets.Organization;
@ -22,6 +24,10 @@ import javax.transaction.Transactional;
@Processes(Contact.class)
public class ContactImExporter
extends AbstractEntityImExporter<Contact> {
private static final Logger LOGGER = LogManager.getLogger(
ContactImExporter.class
);
@Inject
private ContactRepository contactRepo;
@ -46,6 +52,11 @@ public class ContactImExporter
@Override
@Transactional(Transactional.TxType.REQUIRED)
protected void saveImportedEntity(final Contact entity) {
LOGGER.info(
"Saving {}: {}",
entity.getClass().getName(),
Objects.toString(entity)
);
contactRepo.save(entity);
}

1
sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/Contact.java
View File

@ -41,7 +41,6 @@ public class Contact implements Exportable, Serializable {
@GeneratedValue(strategy = GenerationType.AUTO)
private long contactId;
@Id
@Column(name = "uuid", unique = true, nullable = false)
private String uuid;

9
sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ContactImExporter.java
View File

@ -1,5 +1,7 @@
package org.scientificcms.contenttypes.sciproject;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.libreccm.imexport.AbstractEntityImExporter;
import org.libreccm.imexport.Processes;
import org.librecms.assets.Organization;
@ -23,6 +25,10 @@ import javax.transaction.Transactional;
@Processes(Contact.class)
public class ContactImExporter
extends AbstractEntityImExporter<Contact> {
private static final Logger LOGGER = LogManager.getLogger(
ContactImExporter.class
);
@Inject
private ContactRepository contactRepo;
@ -50,10 +56,7 @@ public class ContactImExporter
@Override
@Transactional(Transactional.TxType.REQUIRED)
protected void saveImportedEntity(final Contact entity) {
final SciProject project = entity.getProject();
project.addContact(entity);
contactRepo.save(entity);
itemRepo.save(project);
}
@Override

3
sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/MembershipImExporter.java
View File

@ -48,10 +48,7 @@ public class MembershipImExporter
@Override
@Transactional(Transactional.TxType.REQUIRED)
protected void saveImportedEntity(final Membership entity) {
final SciProject project = entity.getProject();
project.addMember(entity);
membershipRepo.save(entity);
itemRepo.save(project);
}
@Override

14
sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/SciProjectIdResolver.java
View File

@ -30,7 +30,7 @@ public class SciProjectIdResolver implements Serializable, ObjectIdResolver {
@Override
public Object resolveId(final ObjectIdGenerator.IdKey id) {
return CdiUtil
final SciProject project = CdiUtil
.createCdiUtil()
.findBean(ContentItemRepository.class)
.findByUuid(id.key.toString(), SciProject.class)
@ -42,6 +42,18 @@ public class SciProjectIdResolver implements Serializable, ObjectIdResolver {
)
)
);
return CdiUtil
.createCdiUtil()
.findBean(ContentItemRepository.class)
.findByUuid(id.key.toString(), SciProject.class)
.orElseThrow(
() -> new IllegalArgumentException(
String.format(
"No SciProject with UUID %s found in the database.",
id.key.toString()
)
)
);
}
@Override