IQSS#11044 fix failing tests

DANS-KNAW · Dec 3, 2024 · ca95ad8 · ca95ad8
1 parent 1af22b5
commit ca95ad8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseFacetServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseFacetServiceBean.java
@@ -56,9 +56,9 @@ public DataverseFacet create(int displayOrder, DatasetFieldType fieldType, Datav
         dataverseFacet.setDisplayOrder(displayOrder);
         dataverseFacet.setDatasetFieldType(fieldType);
         dataverseFacet.setDataverse(ownerDv);
-
-        em.persist(dataverseFacet);
         ownerDv.getDataverseFacets().add(dataverseFacet);
+        em.persist(dataverseFacet);
+
         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
@@ -93,7 +93,6 @@ private void processInputLevels(CommandContext ctxt) {
                 dataverse.addInputLevelsMetadataBlocksIfNotPresent(inputLevels);
             }
             ctxt.fieldTypeInputLevels().deleteFacetsFor(dataverse);
-            dataverse.setDataverseFieldTypeInputLevels(new ArrayList<>());
             inputLevels.forEach(inputLevel -> {
                 inputLevel.setDataverse(dataverse);
                 ctxt.fieldTypeInputLevels().create(inputLevel);