#11044 refresh facet array

IQSS · Nov 25, 2024 · f0e1916 · f0e1916
1 parent b8e4758
commit f0e1916
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseFacetServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseFacetServiceBean.java
@@ -4,6 +4,8 @@
 import java.util.List;
 import jakarta.ejb.EJB;
 import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 import jakarta.inject.Named;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
@@ -42,23 +44,27 @@ public void delete(DataverseFacet dataverseFacet) {
         cache.invalidate();
     }
 
+    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
 	public void deleteFacetsFor( Dataverse d ) {
 		em.createNamedQuery("DataverseFacet.removeByOwnerId")
 			.setParameter("ownerId", d.getId())
 				.executeUpdate();
         cache.invalidate(d.getId());
-        
+
 	}
 
-    public DataverseFacet create(int displayOrder, DatasetFieldType fieldType, Dataverse ownerDv) {
+    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)    
+        public DataverseFacet create(int displayOrder, DatasetFieldType fieldType, Dataverse ownerDv) {
         DataverseFacet dataverseFacet = new DataverseFacet();
 
         dataverseFacet.setDisplayOrder(displayOrder);
         dataverseFacet.setDatasetFieldType(fieldType);
         dataverseFacet.setDataverse(ownerDv);
-
-        ownerDv.getDataverseFacets().add(dataverseFacet);
+
         em.persist(dataverseFacet);
+        ownerDv.getDataverseFacets().add(dataverseFacet);
+        em.merge(ownerDv);
+        cache.invalidate(ownerDv.getId());
         return dataverseFacet;
     }
 

diff --git a/...main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractWriteDataverseCommand.java b/...main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractWriteDataverseCommand.java
@@ -56,7 +56,8 @@ public Dataverse execute(CommandContext ctxt) throws CommandException {
 
         if (facets != null) {
             ctxt.facets().deleteFacetsFor(dataverse);
-
+            dataverse.setDataverseFacets(new ArrayList<>());
+
             if (!facets.isEmpty()) {
                 dataverse.setFacetRoot(true);
             }